Repository: ambari Updated Branches: refs/heads/trunk e1f5afe44 -> 39f2a49bb
AMBARI-7137 Incorrect behavior of Config tab. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/39f2a49b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/39f2a49b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/39f2a49b Branch: refs/heads/trunk Commit: 39f2a49bbe8047746557afeee5b2abb7073bf17d Parents: e1f5afe Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Wed Sep 3 20:32:38 2014 +0300 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Wed Sep 3 20:32:58 2014 +0300 ---------------------------------------------------------------------- ambari-web/app/mappers/service_config_version_mapper.js | 1 + ambari-web/app/routes/main.js | 2 +- ambari-web/app/views/main/service/menu.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/39f2a49b/ambari-web/app/mappers/service_config_version_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/service_config_version_mapper.js b/ambari-web/app/mappers/service_config_version_mapper.js index 11a1d25..5681458 100644 --- a/ambari-web/app/mappers/service_config_version_mapper.js +++ b/ambari-web/app/mappers/service_config_version_mapper.js @@ -55,6 +55,7 @@ App.serviceConfigVersionsMapper = App.QuickDataMapper.create({ if (!isNaN(itemTotal)) { App.router.set('mainConfigHistoryController.filteredCount', itemTotal); } + App.store.commit(); App.store.loadMany(this.get('model'), result); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/39f2a49b/ambari-web/app/routes/main.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js index 31f9afb..057b836 100644 --- a/ambari-web/app/routes/main.js +++ b/ambari-web/app/routes/main.js @@ -614,7 +614,7 @@ module.exports = Em.Route.extend({ mainServiceInfoConfigsController.showSavePopup(router.get('location.lastSetURL').replace('configs', 'summary')); return false; } - var parent = event.view._parentView; + var parent = event.view.get('_parentView'); parent.deactivateChildViews(); event.view.set('active', "active"); router.transitionTo(event.context); http://git-wip-us.apache.org/repos/asf/ambari/blob/39f2a49b/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 ab78b3b..c329921 100644 --- a/ambari-web/app/views/main/service/menu.js +++ b/ambari-web/app/views/main/service/menu.js @@ -80,7 +80,7 @@ App.MainServiceMenuView = Em.CollectionView.extend({ link: function() { var stateName = (['summary','configs'].contains(App.router.get('currentState.name'))) - ? this.get('isConfigurable') ? App.router.get('currentState.name') : 'summary' + ? this.get('isConfigurable') && this.get('parentView.activeServiceId') != this.get('content.id') ? App.router.get('currentState.name') : 'summary' : 'summary'; return "#/main/services/" + this.get('content.id') + "/" + stateName; }.property('App.router.currentState.name', 'parentView.activeServiceId', 'isConfigurable'),
