incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject [2/2] git commit: AMBARI-3858. "Add New Hosts" wizard appears automatically after it closed and re-login to UI. (onechiporenko)
Date Fri, 22 Nov 2013 14:15:11 GMT
AMBARI-3858. "Add New Hosts" wizard appears automatically after it closed and re-login to UI.
(onechiporenko)


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

Branch: refs/heads/trunk
Commit: c3321560768d5c3417e16096bd4ccf44c7638fd8
Parents: 4fe3a71
Author: Oleg Nechiporenko <cv_github@yahoo.com>
Authored: Fri Nov 22 16:12:48 2013 +0200
Committer: Oleg Nechiporenko <cv_github@yahoo.com>
Committed: Fri Nov 22 16:15:06 2013 +0200

----------------------------------------------------------------------
 ambari-web/app/routes/add_host_routes.js    | 6 ++++++
 ambari-web/app/routes/add_service_routes.js | 6 ++++++
 ambari-web/app/views/wizard/step7_view.js   | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c3321560/ambari-web/app/routes/add_host_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_host_routes.js b/ambari-web/app/routes/add_host_routes.js
index 4505624..cf0d0bc 100644
--- a/ambari-web/app/routes/add_host_routes.js
+++ b/ambari-web/app/routes/add_host_routes.js
@@ -43,6 +43,12 @@ module.exports = Em.Route.extend({
         onClose: function() {
           this.hide();
           App.router.get('updateController').set('isWorking', true);
+          App.clusterStatus.setClusterStatus({
+            clusterName: App.router.get('content.cluster.name'),
+            clusterState: 'DEFAULT',
+            wizardControllerName: App.router.get('addHostController.name'),
+            localdb: App.db.data
+          });
           router.transitionTo('hosts.index');
         },
         didInsertElement: function(){

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c3321560/ambari-web/app/routes/add_service_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_service_routes.js b/ambari-web/app/routes/add_service_routes.js
index 80aa6ef..9782485 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -45,6 +45,12 @@ module.exports = Em.Route.extend({
             this.set('showCloseButton', false); // prevent user to click "Close" many times
             App.router.get('updateController').set('isWorking', true);
             var self = this;
+            App.clusterStatus.setClusterStatus({
+              clusterName: App.router.get('content.cluster.name'),
+              clusterState: 'DEFAULT',
+              wizardControllerName: App.router.get('addServiceController.name'),
+              localdb: App.db.data
+            });
             App.router.get('updateController').updateServiceMetric(function(){
               self.hide();
             });

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c3321560/ambari-web/app/views/wizard/step7_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step7_view.js b/ambari-web/app/views/wizard/step7_view.js
index 326f441..7f88958 100644
--- a/ambari-web/app/views/wizard/step7_view.js
+++ b/ambari-web/app/views/wizard/step7_view.js
@@ -35,7 +35,7 @@ App.WizardStep7View = Em.View.extend({
           break;
         }
       }
-      $('.nav-tabs li:eq(' + tabIndex + ') a').trigger('click');
+      self.$().find('.nav-tabs li:eq(' + tabIndex + ') a').trigger('click');
     });
   }
 


Mime
View raw message