You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/02/10 14:52:24 UTC
git commit: AMBARI-4574 Upon restart of ambari-server,
the service status on Dashboard page remain unchanged. (ababiichuk)
Updated Branches:
refs/heads/trunk 9b7f183cb -> 8a9d841ee
AMBARI-4574 Upon restart of ambari-server, the service status on Dashboard page remain unchanged. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8a9d841e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8a9d841e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8a9d841e
Branch: refs/heads/trunk
Commit: 8a9d841ee4e1cd3a137e75b05c5490ad2de5e206
Parents: 9b7f183
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Feb 10 15:49:05 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Feb 10 15:49:05 2014 +0200
----------------------------------------------------------------------
ambari-web/app/router.js | 4 ++--
ambari-web/app/routes/installer.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a9d841e/ambari-web/app/router.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index 8b0bbc3..b3a196d 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -263,13 +263,13 @@ App.Router = Em.Router.extend({
if (App.alwaysGoToInstaller) {
return 'installer';
} else {
- return 'main.index';
+ return 'main.dashboard';
}
}
App.clusterStatus.updateFromServer(false, false);
var clusterStatusOnServer = App.clusterStatus.get('value');
if (!App.get('isAdmin') || clusterStatusOnServer && clusterStatusOnServer.clusterState === 'DEFAULT') {
- return 'main.index';
+ return 'main.dashboard';
} 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
return 'main.hostAdd';
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a9d841e/ambari-web/app/routes/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js
index f589806..df0056e 100644
--- a/ambari-web/app/routes/installer.js
+++ b/ambari-web/app/routes/installer.js
@@ -68,7 +68,7 @@ module.exports = Em.Route.extend({
break;
case 'DEFAULT' :
default:
- router.transitionTo('main.index');
+ router.transitionTo('main.dashboard');
break;
}
}
@@ -411,7 +411,7 @@ module.exports = Em.Route.extend({
// We need to do recovery based on whether we are in Add Host or Installer wizard
controller.saveClusterState('DEFAULT');
- router.transitionTo('main.index');
+ router.transitionTo('main.dashboard');
}
}),