You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2013/12/06 13:03:52 UTC
git commit: AMBARI-4002. Incorrect navigation between pages. (Denis
Buzhor via onechiporenko)
Updated Branches:
refs/heads/trunk 81fdc69aa -> 7199a0b41
AMBARI-4002. Incorrect navigation between pages. (Denis Buzhor via onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7199a0b4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7199a0b4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7199a0b4
Branch: refs/heads/trunk
Commit: 7199a0b41933e01d0c3ec9399c781684f3cabb67
Parents: 81fdc69
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Fri Dec 6 14:03:35 2013 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Fri Dec 6 14:03:35 2013 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/main/charts/heatmap.js | 10 ++--------
.../app/templates/main/charts/heatmap/heatmap_host.hbs | 2 +-
2 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7199a0b4/ambari-web/app/controllers/main/charts/heatmap.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/charts/heatmap.js b/ambari-web/app/controllers/main/charts/heatmap.js
index dbe8843..6446ad2 100644
--- a/ambari-web/app/controllers/main/charts/heatmap.js
+++ b/ambari-web/app/controllers/main/charts/heatmap.js
@@ -107,13 +107,7 @@ App.MainChartsHeatmapController = Em.Controller.extend({
}
}
}.observes('inputMaximum'),
- /**
- * route on host detail page
- * @param event
- */
- routeHostDetail: function (event) {
- App.router.transitionTo('main.hosts.hostDetails.summary', event.context)
- },
+
showHeatMapMetric: function (event) {
var metricItem = event.context;
if (metricItem) {
@@ -148,4 +142,4 @@ App.MainChartsHeatmapController = Em.Controller.extend({
return "span4";
}
}.property('cluster')
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/7199a0b4/ambari-web/app/templates/main/charts/heatmap/heatmap_host.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/charts/heatmap/heatmap_host.hbs b/ambari-web/app/templates/main/charts/heatmap/heatmap_host.hbs
index dfdc914..fbe3722 100644
--- a/ambari-web/app/templates/main/charts/heatmap/heatmap_host.hbs
+++ b/ambari-web/app/templates/main/charts/heatmap/heatmap_host.hbs
@@ -17,5 +17,5 @@
}}
<div {{bindAttr class="view.hostClass"}} {{bindAttr style="view.hostTemperatureStyle"}}>
- <a href="#" class="heatmap-host" {{action "routeHostDetail" view.content target="controller"}}></a>
+ <a href="#" class="heatmap-host" {{action "showDetails" view.content}}></a>
</div>
\ No newline at end of file