ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject git commit: AMBARI-3984. Config Groups: Background popup show up needs to be integrated when restarting components. (xiwang via yusaku)
Date Thu, 05 Dec 2013 19:22:08 GMT
Updated Branches:
  refs/heads/trunk 7a88b2c6b -> bd37807ac


AMBARI-3984. Config Groups: Background popup show up needs to be integrated when restarting
components. (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/bd37807a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bd37807a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bd37807a

Branch: refs/heads/trunk
Commit: bd37807ac941e35e92b1b7909cf94c9f49389a34
Parents: 7a88b2c
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Thu Dec 5 11:23:03 2013 -0800
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Thu Dec 5 11:23:03 2013 -0800

----------------------------------------------------------------------
 ambari-web/app/controllers/main/host/details.js         | 7 ++++++-
 ambari-web/app/controllers/main/service/info/configs.js | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/bd37807a/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 d0dcfa3..8162166 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -1045,7 +1045,12 @@ App.MainHostDetailsController = Em.Controller.extend({
           });
         });
         this.hide();
-        App.router.get('backgroundOperationsController').showPopup();
+        // load data (if we need to show this background operations popup) from persist
+        App.router.get('applicationController').dataLoading().done(function (initValue) {
+          if (initValue) {
+            App.router.get('backgroundOperationsController').showPopup();
+          }
+        });
       }
     });
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/bd37807a/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index 976b3d8..505f1e0 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -1792,7 +1792,12 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
           });
         })
         this.hide();
-        App.router.get('backgroundOperationsController').showPopup();
+        // load data (if we need to show this background operations popup) from persist
+        App.router.get('applicationController').dataLoading().done(function (initValue) {
+          if (initValue) {
+            App.router.get('backgroundOperationsController').showPopup();
+          }
+        });
       },
       onSecondary: function () {
         this.hide();


Mime
View raw message