Author: yusaku
Date: Sat Apr 27 03:20:53 2013
New Revision: 1476481
URL: http://svn.apache.org/r1476481
Log:
AMBARI-2035. "Add local user" button is enabled but nothing happens upon
clicking it under certain conditions. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/routes/main.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1476481&r1=1476480&r2=1476481&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat Apr 27 03:20:53 2013
@@ -802,6 +802,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2035. "Add local user" button is enabled but nothing happens upon
+ clicking it under certain conditions. (yusaku)
+
AMBARI-2034. Disable "Add Component" button in the Host Details page if the
host is in UNKNOWN state or !isHeartbeating. (yusaku)
Modified: incubator/ambari/trunk/ambari-web/app/routes/main.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/routes/main.js?rev=1476481&r1=1476480&r2=1476481&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/main.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/main.js Sat Apr 27 03:20:53
2013
@@ -548,26 +548,21 @@ module.exports = Em.Route.extend({
admin: Em.Route.extend({
route: '/admin',
enter: function (router, transition) {
- var controller = router.get('mainAdminController');
- if (!App.db.getUser().admin) {
+ if (!App.isAdmin) {
Em.run.next(function () {
router.transitionTo('main.dashboard');
});
- } else {
- // Em.run.next(function () {
- // router.transitionTo('admin' +
controller.get('category').capitalize());
- //});
}
},
routePath: function (router, event) {
- if (!App.db.getUser().admin) {
+ if (!App.isAdmin) {
Em.run.next(function () {
App.router.transitionTo('main.dashboard');
});
} else {
- // var controller = router.get('mainAdminController');
- //router.transitionTo('admin' +
controller.get('category').capitalize());
+ var controller = router.get('mainAdminController');
+ router.transitionTo('admin' + controller.get('category').capitalize());
}
},
connectOutlets: function (router, context) {
