Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 97A70200BC9 for ; Sat, 12 Nov 2016 00:57:09 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 94CF4160B01; Fri, 11 Nov 2016 23:57:09 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D9D34160AF6 for ; Sat, 12 Nov 2016 00:57:08 +0100 (CET) Received: (qmail 30361 invoked by uid 500); 11 Nov 2016 23:57:08 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 30352 invoked by uid 99); 11 Nov 2016 23:57:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Nov 2016 23:57:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DC46CE01F4; Fri, 11 Nov 2016 23:57:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rzang@apache.org To: commits@ambari.apache.org Message-Id: <409cfb788f31487283b2d95a736d3245@git.apache.org> X-Mailer: ASF-Git Admin Mailer 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 +0000 (UTC) archived-at: Fri, 11 Nov 2016 23:57:09 -0000 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 Authored: Fri Nov 11 15:56:26 2016 -0800 Committer: Richard Zang 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,