git commit: AMBARI-3954. hbase.zookeeper.quorum changing inconsistently on hosts after adding ZookeeperServer. (onechiporenko)

[onechiporenko]

Updated Branches:
  refs/heads/branch-1.4.2 7fe1dd91e -> 294d3c1d5


AMBARI-3954. hbase.zookeeper.quorum changing inconsistently on hosts after 
adding ZookeeperServer. (onechiporenko)


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

Branch: refs/heads/branch-1.4.2
Commit: 294d3c1d505f290d853179de036f89a767fe6934
Parents: 7fe1dd9
Author: Oleg Nechiporenko <onechipore...@apache.org>
Authored: Mon Dec 9 15:30:34 2013 +0200
Committer: Oleg Nechiporenko <onechipore...@apache.org>
Committed: Mon Dec 9 15:34:08 2013 +0200

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/294d3c1d/ambari-web/app/controllers/main/host/details.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/details.js 
b/ambari-web/app/controllers/main/host/details.js
index 7e0d542..2c8c33b 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -578,6 +578,7 @@ App.MainHostDetailsController = Em.Controller.extend({
   getZkServerHosts: function() {
     var zks = App.HostComponent.find().filterProperty('componentName', 
'ZOOKEEPER_SERVER').mapProperty('host.hostName');
     if (this.get('fromDeleteHost')) {
+      this.set('fromDeleteHost', false);
       return zks.without(this.get('content.hostName'));
     }
     return zks;
@@ -945,8 +946,8 @@ App.MainHostDetailsController = Em.Controller.extend({
         templateName: require('templates/main/host/details/doDeleteHostPopup')
       }),
       onPrimary: function() {
-        self.set('fromDeleteHost', true);
         if (!this.get('enablePrimary')) return;
+        self.set('fromDeleteHost', true);
         var allComponents = self.get('content.hostComponents');
         var deleteError = null;
         allComponents.forEach(function(component){
@@ -976,7 +977,6 @@ App.MainHostDetailsController = Em.Controller.extend({
         var dialogSelf = this;
         App.router.get('updateController').updateHost(function(){
           self.loadConfigs();
-          self.set('fromDeleteHost', false);
           dialogSelf.hide();
           App.router.transitionTo('hosts.index');
         });
@@ -987,7 +987,6 @@ App.MainHostDetailsController = Em.Controller.extend({
         console.log(errorThrown);
         xhr.responseText = "{\"message\": \"" + xhr.statusText + "\"}";
         self.loadConfigs();
-        this.set('fromDeleteHost', false);
         this.hide();
         App.ajax.defaultErrorHandler(xhr, opt.url, 'DELETE', xhr.status);
       }