فهرست منبع

AMBARI-15941. Fix bugs with config groups restoring after next/back actions (akovalenko)

Aleksandr Kovalenko 9 سال پیش
والد
کامیت
4ff426f9b7

+ 1 - 0
ambari-web/app/controllers/main/service/manage_config_groups_controller.js

@@ -579,6 +579,7 @@ App.ManageConfigGroupsController = Em.Controller.extend(App.ConfigOverridable, {
     this.set('selectedHosts', selectedConfigGroup.get('hosts'));
     this.deleteHosts();
     this.get('configGroups').removeObject(selectedConfigGroup);
+    App.configGroupsMapper.deleteRecord(selectedConfigGroup);
     this.set('selectedConfigGroup', this.get('configGroups').findProperty('isDefault'));
     this.propertyDidChange('groupDeleteTrigger');
   },

+ 1 - 1
ambari-web/app/controllers/wizard/step7_controller.js

@@ -1034,7 +1034,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
   /**
    * load default groups for each service in case of initial load
    * @param serviceConfigGroups
-   * @method loadConfigGroups
+   * @method restoreConfigGroups
    */
   restoreConfigGroups: function (serviceConfigGroups) {
     var services = this.get('stepConfigs');

+ 6 - 0
ambari-web/test/controllers/main/service/manage_config_groups_controller_test.js

@@ -177,6 +177,12 @@ describe('App.ManageConfigGroupsController', function() {
         configGroups: [defaultGroup, selectedGroup],
         selectedConfigGroup: selectedGroup
       });
+
+      sinon.stub(App.configGroupsMapper, 'deleteRecord', Em.K);
+    });
+
+    afterEach(function(){
+      App.configGroupsMapper.deleteRecord.restore();
     });
 
     it('after deleting some config group, Default should be selected', function () {