Updated Branches: refs/heads/trunk 72dc18d7e -> 41c4f21ec
AMBARI-3223 Custom config properties cannot be added in Customize Services. (atkach) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/41c4f21e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/41c4f21e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/41c4f21e Branch: refs/heads/trunk Commit: 41c4f21ec1fd323416efd1a6a87191a3d819c64d Parents: 72dc18d Author: atkach <[email protected]> Authored: Fri Sep 13 13:04:58 2013 +0300 Committer: atkach <[email protected]> Committed: Fri Sep 13 13:04:58 2013 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/main.js | 9 +-------- ambari-web/app/router.js | 14 ++++++++++++++ ambari-web/app/routes/add_service_routes.js | 2 +- ambari-web/app/routes/installer.js | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/41c4f21e/ambari-web/app/controllers/main.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main.js b/ambari-web/app/controllers/main.js index 6f2701f..beb0110 100644 --- a/ambari-web/app/controllers/main.js +++ b/ambari-web/app/controllers/main.js @@ -43,16 +43,9 @@ App.MainController = Em.Controller.extend({ * run all processes and cluster's data loading */ initialize: function(){ - this.initAdmin(); App.router.get('clusterController').loadClusterData(); this.startPolling(); }, - initAdmin: function(){ - if(App.db && App.db.getUser() && App.db.getUser().admin) { - App.set('isAdmin', true); - console.log('Administrator logged in'); - } - }, dataLoading: function () { var self = this; @@ -96,4 +89,4 @@ App.MainController = Em.Controller.extend({ ); }.observes("App.router.location.lastSetURL", "App.clusterStatus.isInstalled") -}) \ No newline at end of file +}) http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/41c4f21e/ambari-web/app/router.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js index a86ff74..c3746f4 100644 --- a/ambari-web/app/router.js +++ b/ambari-web/app/router.js @@ -336,12 +336,26 @@ App.Router = Em.Router.extend({ console.log("failed to invoke logout on the server"); }, + /** + * initialize isAdmin if user is administrator + */ + initAdmin: function(){ + if(App.db && App.db.getUser() && App.db.getUser().admin) { + App.set('isAdmin', true); + console.log('Administrator logged in'); + } + }, + root: Em.Route.extend({ index: Em.Route.extend({ route: '/', redirectsTo: 'login' }), + enter: function(router){ + router.initAdmin(); + }, + login: Em.Route.extend({ route: '/login', http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/41c4f21e/ambari-web/app/routes/add_service_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/add_service_routes.js b/ambari-web/app/routes/add_service_routes.js index db5a59c..5bbc3da 100644 --- a/ambari-web/app/routes/add_service_routes.js +++ b/ambari-web/app/routes/add_service_routes.js @@ -23,7 +23,7 @@ module.exports = Em.Route.extend({ enter: function (router) { console.log('in /service/add:enter'); - if (App.db.getUser().admin) { + if (App.get('isAdmin')) { Em.run.next(function () { var addServiceController = router.get('addServiceController'); App.router.get('updateController').set('isWorking', false); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/41c4f21e/ambari-web/app/routes/installer.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js index 5222a5f..55434e4 100644 --- a/ambari-web/app/routes/installer.js +++ b/ambari-web/app/routes/installer.js @@ -31,7 +31,7 @@ module.exports = Em.Route.extend({ var name = 'Cluster Install Wizard'; $('title').text('Ambari - ' + name); - if (App.db.getUser().admin) { + if (App.get('isAdmin')) { router.get('mainController').stopPolling(); console.log('In installer with successful authenticated'); console.log('current step=' + router.get('installerController.currentStep'));
