Prechádzať zdrojové kódy

AMBARI-7137 Incorrect behavior of Config tab. (ababiichuk)

aBabiichuk 10 rokov pred
rodič
commit
39f2a49bbe

+ 1 - 0
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);
     }
   }

+ 1 - 1
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);

+ 1 - 1
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'),