AMBARI-3640. Reassign Master: manual commands step disappear after logout/login (HA enabled). (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/d6277f61 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/d6277f61 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/d6277f61 Branch: refs/heads/trunk Commit: d6277f61937dc37460b260b27cabb33c9d8380fa Parents: e524a02 Author: Aleksandr Kovalenko <[email protected]> Authored: Thu Oct 31 17:55:27 2013 +0200 Committer: Aleksandr Kovalenko <[email protected]> Committed: Thu Oct 31 17:57:23 2013 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/main/service/reassign_controller.js | 4 +--- ambari-web/app/router.js | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/d6277f61/ambari-web/app/controllers/main/service/reassign_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/reassign_controller.js b/ambari-web/app/controllers/main/service/reassign_controller.js index 1cd2a9d..f5ee208 100644 --- a/ambari-web/app/controllers/main/service/reassign_controller.js +++ b/ambari-web/app/controllers/main/service/reassign_controller.js @@ -61,9 +61,7 @@ App.ReassignMasterController = App.WizardController.extend({ }), addManualSteps: function () { - if (this.get('content.componentsWithManualCommands')) { // While logging off this function is called with content.componentsWithManualCommands undefined - this.set('content.hasManualSteps', this.get('content.componentsWithManualCommands').contains(this.get('content.reassign.component_name')) || this.get('content.securityEnabled')); - } + this.set('content.hasManualSteps', this.get('content.componentsWithManualCommands').contains(this.get('content.reassign.component_name')) || this.get('content.securityEnabled')); }.observes('content.reassign.component_name', 'content.securityEnabled'), getSecurityStatus: function () { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/d6277f61/ambari-web/app/router.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js index fe82b35..0ec62f9 100644 --- a/ambari-web/app/router.js +++ b/ambari-web/app/router.js @@ -39,7 +39,6 @@ App.Router = Em.Router.extend({ this.get('addHostController').clear(); this.get('addServiceController').clear(); this.get('stackUpgradeController').clear(); - this.get('reassignMasterController').clear(); for (i = 1; i < 11; i++) { this.set('wizardStep' + i + 'Controller.hasSubmitted', false); this.set('wizardStep' + i + 'Controller.isDisabled', true);
