You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/12/05 20:08:25 UTC

git commit: AMBARI-3982. Background operations window, called from wizard doesn't react to 'Do not show this dialog...' flag. (xiwang via yusaku)

Updated Branches:
  refs/heads/trunk 953262cef -> 7a88b2c6b


AMBARI-3982. Background operations window, called from wizard doesn't react to 'Do not show this dialog...' flag. (xiwang via yusaku)


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

Branch: refs/heads/trunk
Commit: 7a88b2c6bae0c99e1e2ad598390062af5095608f
Parents: 953262c
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu Dec 5 11:08:54 2013 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Thu Dec 5 11:08:54 2013 -0800

----------------------------------------------------------------------
 .../app/views/main/admin/highAvailability/progress_view.js      | 5 ++++-
 ambari-web/app/views/main/service/reconfigure.js                | 5 ++++-
 ambari-web/app/views/wizard/stack_upgrade/step3_view.js         | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7a88b2c6/ambari-web/app/views/main/admin/highAvailability/progress_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/highAvailability/progress_view.js b/ambari-web/app/views/main/admin/highAvailability/progress_view.js
index f5712c5..5d193bf 100644
--- a/ambari-web/app/views/main/admin/highAvailability/progress_view.js
+++ b/ambari-web/app/views/main/admin/highAvailability/progress_view.js
@@ -111,7 +111,10 @@ App.HighAvailabilityProgressPageView = Em.View.extend({
       if(!!this.get('content.hosts.length')){
         var serviceName = event.contexts[0].title;
         var controller = this.get("controller");
-        App.HostPopup.initPopup(serviceName, controller);
+        App.router.get('applicationController').dataLoading().done(function (initValue) {
+          var popupView = App.HostPopup.initPopup(serviceName, controller);
+          popupView.set ('isNotShowBgChecked', !initValue);
+        })
       }
     }
   })

http://git-wip-us.apache.org/repos/asf/ambari/blob/7a88b2c6/ambari-web/app/views/main/service/reconfigure.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/reconfigure.js b/ambari-web/app/views/main/service/reconfigure.js
index 0d5c990..5a9b86b 100644
--- a/ambari-web/app/views/main/service/reconfigure.js
+++ b/ambari-web/app/views/main/service/reconfigure.js
@@ -49,7 +49,10 @@ App.StageLabelView = Em.View.extend({
   showHostPopup: function (label) {
     var serviceName = label;
     var controller = this.get("controller");
-    App.HostPopup.initPopup(serviceName, controller);
+    App.router.get('applicationController').dataLoading().done(function (initValue) {
+      var popupView = App.HostPopup.initPopup(serviceName, controller);
+      popupView.set ('isNotShowBgChecked', !initValue);
+    })
   },
 
   isStarted: function () {

http://git-wip-us.apache.org/repos/asf/ambari/blob/7a88b2c6/ambari-web/app/views/wizard/stack_upgrade/step3_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/stack_upgrade/step3_view.js b/ambari-web/app/views/wizard/stack_upgrade/step3_view.js
index 7c6efd8..e022a71 100644
--- a/ambari-web/app/views/wizard/stack_upgrade/step3_view.js
+++ b/ambari-web/app/views/wizard/stack_upgrade/step3_view.js
@@ -136,7 +136,10 @@ App.StackUpgradeStep3View = Em.View.extend({
     hostsLogPopup: function(event){
       var serviceName = event.contexts[0];
       var controller = this.get("controller");
-      App.HostPopup.initPopup(serviceName, controller);
+      App.router.get('applicationController').dataLoading().done(function (initValue) {
+        var popupView = App.HostPopup.initPopup(serviceName, controller);
+        popupView.set ('isNotShowBgChecked', !initValue);
+      })
     }
   })
 });
\ No newline at end of file