Repository: ambari
Updated Branches:
  refs/heads/branch-1.6.0 2a753b94d -> b1ac8e346


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/b1ac8e34
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1ac8e34
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1ac8e34

Branch: refs/heads/branch-1.6.0
Commit: b1ac8e346c3c9453722d53a4812eceaeb2fa7668
Parents: 2a753b9
Author: aBabiichuk <[email protected]>
Authored: Thu May 15 17:48:14 2014 +0300
Committer: aBabiichuk <[email protected]>
Committed: Thu May 15 17:55:47 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/b1ac8e34/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

Reply via email to