ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rz...@apache.org
Subject ambari git commit: AMBARI-18855 - Manage JournalNode Wizard: While assigning new JournalNodes, Current JournalNode selection value changes (rzang)
Date Fri, 11 Nov 2016 23:57:07 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 487f20a66 -> 84972e3b8


AMBARI-18855 - Manage JournalNode Wizard: While assigning new JournalNodes, Current JournalNode
selection value changes (rzang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/84972e3b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/84972e3b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/84972e3b

Branch: refs/heads/branch-2.5
Commit: 84972e3b898aac688deb2f625d0b084ae0f8f814
Parents: 487f20a
Author: Richard Zang <rzang@apache.org>
Authored: Fri Nov 11 15:56:26 2016 -0800
Committer: Richard Zang <rzang@apache.org>
Committed: Fri Nov 11 15:56:26 2016 -0800

----------------------------------------------------------------------
 .../main/admin/highAvailability/journalNode/step1_controller.js | 5 ++++-
 ambari-web/app/mixins/wizard/assign_master_components.js        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/84972e3b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step1_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step1_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step1_controller.js
index c834517..b6ffe5b 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step1_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step1_controller.js
@@ -34,6 +34,8 @@ App.ManageJournalNodeWizardStep1Controller = Em.Controller.extend(App.BlueprintM
 
   JOURNALNODES_COUNT_MINIMUM: 3, // TODO get this from stack
 
+  nextButtonCheckTrigger: true,
+
   /**
    * On initial rendering, load equivalent number of existing JournalNodes to masterToShow
    * @param masterComponents
@@ -50,6 +52,7 @@ App.ManageJournalNodeWizardStep1Controller = Em.Controller.extend(App.BlueprintM
     this._super(masterComponents);
     this.updateJournalNodeInfo();
     this.showHideJournalNodesAddRemoveControl();
+    this.toggleProperty('nextButtonCheckTrigger');
   },
 
   /**
@@ -103,7 +106,7 @@ App.ManageJournalNodeWizardStep1Controller = Em.Controller.extend(App.BlueprintM
     var currentHosts = this.get('selectedServicesMasters').filterProperty('component_name',
'JOURNALNODE').mapProperty('selectedHost');
     var originalHosts = App.HostComponent.find().filterProperty('componentName', 'JOURNALNODE').mapProperty('hostName');
     return currentHosts.sort().join() == originalHosts.sort().join();
-  }.property('hostNameCheckTrigger')
+  }.property('hostNameCheckTrigger', 'nextButtonCheckTrigger')
 
 });
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/84972e3b/ambari-web/app/mixins/wizard/assign_master_components.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js b/ambari-web/app/mixins/wizard/assign_master_components.js
index 46409b2..d8ada11 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -1054,7 +1054,7 @@ App.AssignMasterComponents = Em.Mixin.create({
      */
 
     var maxNumMasters = this.getMaxNumberOfMasters(componentName),
-        currentMasters = this.get("selectedServicesMasters").filterProperty("component_name",
componentName),
+        currentMasters = this.get("selectedServicesMasters").filterProperty("component_name",
componentName).sortProperty('serviceComponentId'),
         newMaster = null,
         masterHosts = null,
         suggestedHost = null,


Mime
View raw message