Repository: ambari
Updated Branches:
  refs/heads/trunk 8d464c2b2 -> ebb4217b2


AMBARI-6765 Unable to discard one of ZK Server components at step 5 of Install 
Wizard. (Max Shepel via atkach)


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

Branch: refs/heads/trunk
Commit: ebb4217b2e4617613127d2420ad6f692a4049a68
Parents: 8d464c2
Author: atkach <atk...@hortonworks.com>
Authored: Thu Aug 7 13:22:13 2014 +0300
Committer: atkach <atk...@hortonworks.com>
Committed: Thu Aug 7 13:22:13 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step5_controller.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ebb4217b/ambari-web/app/controllers/wizard/step5_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step5_controller.js 
b/ambari-web/app/controllers/wizard/step5_controller.js
index 0c6af07..1f42717 100644
--- a/ambari-web/app/controllers/wizard/step5_controller.js
+++ b/ambari-web/app/controllers/wizard/step5_controller.js
@@ -252,9 +252,10 @@ App.WizardStep5Controller = Em.Controller.extend({
     var showControl = !services.contains(currentService);
 
     if (showControl) {
-      if (this.get("selectedServicesMasters").filterProperty("component_name", 
componentName).length < this.get("hosts.length") && 
!this.get('isReassignWizard') && !this.get('isHighAvailabilityWizard')) {
+      var mastersLength = 
this.get("selectedServicesMasters").filterProperty("component_name", 
componentName).length;
+      if (mastersLength < this.get("hosts.length") && 
!this.get('isReassignWizard') && !this.get('isHighAvailabilityWizard')) {
         component.set('showAddControl', true);
-      } else {
+      } else if (mastersLength == 1 || this.get('isReassignWizard') || 
this.get('isHighAvailabilityWizard')) {
         component.set('showRemoveControl', false);
       }
     }

Reply via email to