Repository: ambari Updated Branches: refs/heads/trunk e256cfe49 -> fa8f8405f
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/fa8f8405 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fa8f8405 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fa8f8405 Branch: refs/heads/trunk Commit: fa8f8405fd746a978523572a667cebd4a284f20b Parents: e256cfe Author: Richard Zang <rz...@apache.org> Authored: Fri Nov 11 15:56:26 2016 -0800 Committer: Richard Zang <rz...@apache.org> Committed: Fri Nov 11 16:04:31 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/fa8f8405/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/fa8f8405/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 70f1638..7ef7fde 100644 --- a/ambari-web/app/mixins/wizard/assign_master_components.js +++ b/ambari-web/app/mixins/wizard/assign_master_components.js @@ -993,7 +993,7 @@ App.AssignMasterComponents = Em.Mixin.create(App.HostComponentValidationMixin, A */ 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,
