Repository: ambari Updated Branches: refs/heads/trunk cb6765fae -> 2947c7ada
AMBARI-5558 Navigating back from Host page to Heatmaps page is broken. (Buzhor Denys via ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2947c7ad Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2947c7ad Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2947c7ad Branch: refs/heads/trunk Commit: 2947c7adaa18061b21dd9e2f813d4650e73e4ecb Parents: cb6765f Author: aBabiichuk <[email protected]> Authored: Thu Apr 24 17:53:56 2014 +0300 Committer: aBabiichuk <[email protected]> Committed: Thu Apr 24 17:54:15 2014 +0300 ---------------------------------------------------------------------- ambari-web/app/routes/main.js | 10 ---------- ambari-web/app/views/main/dashboard.js | 8 +++----- 2 files changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2947c7ad/ambari-web/app/routes/main.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js index 17d8bfd..8e0aa43 100644 --- a/ambari-web/app/routes/main.js +++ b/ambari-web/app/routes/main.js @@ -85,11 +85,6 @@ module.exports = Em.Route.extend({ connectOutlets: function (router, context) { router.get('mainController').connectOutlet('mainDashboard'); }, - enter: function (router) { - Em.run.next(function () { - router.transitionTo('widgets'); - }); - }, index: Em.Route.extend({ route: '/', redirectsTo: 'widgets' @@ -111,11 +106,6 @@ module.exports = Em.Route.extend({ router.set('mainDashboardController.selectedCategory', 'charts'); router.get('mainDashboardController').connectOutlet('mainCharts'); }, - enter: function (router) { - Em.run.next(function () { - router.transitionTo('heatmap'); - }); - }, index: Ember.Route.extend({ route: '/', redirectsTo: 'heatmap' http://git-wip-us.apache.org/repos/asf/ambari/blob/2947c7ad/ambari-web/app/views/main/dashboard.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard.js b/ambari-web/app/views/main/dashboard.js index a8c2b5b..eb6700b 100644 --- a/ambari-web/app/views/main/dashboard.js +++ b/ambari-web/app/views/main/dashboard.js @@ -27,19 +27,17 @@ App.MainDashboardView = Em.View.extend({ categories: function() { var items = [{ name: 'widgets', - url: 'dashboard.index', + url: 'dashboard.widgets', label: Em.I18n.t('dashboard.widgets.title'), isActive: function () { - debugger; return 'widgets' === this.get('selected'); }.property('selected') }, { name: 'charts', - url: 'dashboard.charts', + url: 'dashboard.charts.heatmap', label: Em.I18n.t('dashboard.heatmaps.title'), isActive: function () { - debugger; return 'charts' === this.get('selected'); }.property('selected') }]; @@ -52,4 +50,4 @@ App.MainDashboardView = Em.View.extend({ return this.get('item') === this.get('parentView.selected'); }.property('item', 'parentView.selected') }) -}); \ No newline at end of file +});
