ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject git commit: AMBARI-5775 Logging in to an already deployed cluster briefly shows the Install Wizard. (ababiichuk)
Date Thu, 15 May 2014 14:55:12 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 73538ee1f -> 548a8c29b


AMBARI-5775 Logging in to an already deployed cluster briefly shows the Install Wizard. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: 548a8c29be2a549cb62ce26730bad2caa3a47d7c
Parents: 73538ee
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Thu May 15 17:50:06 2014 +0300
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Thu May 15 17:54:29 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/router.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/548a8c29/ambari-web/app/router.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index 73045d3..2e63d69 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -280,7 +280,7 @@ App.Router = Em.Router.extend({
     }
     App.clusterStatus.updateFromServer(false, false);
     var clusterStatusOnServer = App.clusterStatus.get('value');
-    if (!App.get('isAdmin') || clusterStatusOnServer && clusterStatusOnServer.clusterState
=== 'DEFAULT') {
+    if (!App.get('isAdmin') || clusterStatusOnServer && (clusterStatusOnServer.clusterState
=== 'DEFAULT' || clusterStatusOnServer.clusterState === 'CLUSTER_STARTED_5')) {
       return 'main.dashboard.index';
     } else if (clusterStatusOnServer && clusterStatusOnServer.wizardControllerName
=== App.router.get('addHostController.name')) {
       // if wizardControllerName == "addHostController", then it means someone closed the
browser or the browser was crashed when we were last in Add Hosts wizard


Mime
View raw message