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/24 16:47:18 UTC
git commit: AMBARI-4803 Service summary called from dashboard is
shown wrong. (Mikhail Bayuk via ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk a48f1e26e -> 8b1cae43f
AMBARI-4803 Service summary called from dashboard is shown wrong. (Mikhail Bayuk via ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8b1cae43
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8b1cae43
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8b1cae43
Branch: refs/heads/trunk
Commit: 8b1cae43f2fbb07830ae7d45aecf82d30fa49937
Parents: a48f1e2
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Feb 24 17:46:04 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Feb 24 17:46:36 2014 +0200
----------------------------------------------------------------------
ambari-web/app/views/main/service/menu.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8b1cae43/ambari-web/app/views/main/service/menu.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/menu.js b/ambari-web/app/views/main/service/menu.js
index 795781b..e80e095 100644
--- a/ambari-web/app/views/main/service/menu.js
+++ b/ambari-web/app/views/main/service/menu.js
@@ -74,8 +74,11 @@ App.MainServiceMenuView = Em.CollectionView.extend({
}.property('content.criticalAlertsCount'),
link: function() {
- return "#/main/services/" + this.get('content.id') + "/" + App.router.get('currentState.name');
- }.property('App.router.currentState.name'),
+ var stateName = (['summary','configs'].contains(App.router.get('currentState.name')))
+ ? App.router.get('currentState.name')
+ : 'summary';
+ return "#/main/services/" + this.get('content.id') + "/" + stateName;
+ }.property('App.router.currentState.name', 'parentView.activeServiceId'),
refreshRestartRequiredMessage: function() {
var restarted, componentsCount, hostsCount, message, tHosts, tComponents;