Bläddra i källkod

AMBARI-9569 Move NameNode wizard fails. (atkach)

Andrii Tkach 10 år sedan
förälder
incheckning
dbafa08de1

+ 11 - 9
ambari-web/app/controllers/main/service/reassign/step1_controller.js

@@ -73,15 +73,17 @@ App.ReassignMasterWizardStep1Controller = Em.Controller.extend({
   onLoadConfigsTags: function (data) {
     var urlParams = this.getConfigUrlParams(this.get('content.reassign.component_name'), data);
 
-    App.ajax.send({
-      name: 'reassign.load_configs',
-      sender: this,
-      data: {
-        urlParams: urlParams.join('|')
-      },
-      success: 'onLoadConfigs',
-      error: ''
-    });
+    if (urlParams.length > 0) {
+      App.ajax.send({
+        name: 'reassign.load_configs',
+        sender: this,
+        data: {
+          urlParams: urlParams.join('|')
+        },
+        success: 'onLoadConfigs',
+        error: ''
+      });
+    }
   },
 
   onLoadConfigs: function (data) {

+ 4 - 4
ambari-web/app/controllers/main/service/reassign/step4_controller.js

@@ -287,12 +287,11 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
    * remove tasks by command name
    */
   removeTasks: function(commands) {
-    var tasks = this.get('tasks'),
-        index = null
-        cmd = null;
+    var tasks = this.get('tasks');
 
     commands.forEach(function(command) {
-      cmd = tasks.filterProperty('command', command);
+      var cmd = tasks.filterProperty('command', command);
+      var index = null;
 
       if (cmd.length === 0) {
         return false;
@@ -334,6 +333,7 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
       }));
     }
     this.removeUnneededTasks();
+    this.set('isLoaded', true);
   },
 
   hideRollbackButton: function () {

+ 1 - 0
ambari-web/app/controllers/main/service/reassign/step6_controller.js

@@ -65,6 +65,7 @@ App.ReassignMasterWizardStep6Controller = App.HighAvailabilityProgressPageContro
     }
 
     this.removeUnneededTasks();
+    this.set('isLoaded', true);
   },
 
   removeUnneededTasks: function () {