Browse Source

AMBARI-3640. Reassign Master: manual commands step disappear after logout/login (HA enabled). (akovalenko)

Aleksandr Kovalenko 11 years ago
parent
commit
d6277f6193

+ 1 - 3
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 () {

+ 0 - 1
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);