Quellcode durchsuchen

AMBARI-18875. Cannot delete config groups with no hosts and some config changes (akovalenko)

Aleksandr Kovalenko vor 8 Jahren
Ursprung
Commit
0e9ddb6b24

+ 1 - 1
ambari-web/app/controllers/main/service/info/configs.js

@@ -461,7 +461,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.AddSecurityConfi
   addOverrides: function(data, allConfigs) {
     var self = this;
     data.items.forEach(function(group) {
-      if (group.group_name !== App.ServiceConfigGroup.defaultGroupName) {
+      if (![App.ServiceConfigGroup.defaultGroupName, App.ServiceConfigGroup.deletedGroupName].contains(group.group_name)) {
         var configGroup = App.ServiceConfigGroup.find().filterProperty('serviceName', group.service_name).findProperty('name', group.group_name);
         group.configurations.forEach(function(config) {
           for (var prop in config.properties) {

+ 1 - 1
ambari-web/app/mappers/configs/config_groups_mapper.js

@@ -63,7 +63,7 @@ App.configGroupsMapper = App.QuickDataMapper.create({
 
       if (json && json.items) {
         json.items.forEach(function (configGroup) {
-          if (configGroup.group_name !== App.ServiceConfigGroup.defaultGroupName) {
+          if (![App.ServiceConfigGroup.defaultGroupName, App.ServiceConfigGroup.deletedGroupName].contains(configGroup.group_name)) {
             if (mapFromVersions) {
               configGroup.id = App.ServiceConfigGroup.groupId(configGroup.service_name, configGroup.group_name);
             } else {

+ 2 - 0
ambari-web/app/models/configs/config_group.js

@@ -161,6 +161,8 @@ App.ServiceConfigGroup.groupId = function(serviceName, groupName) {
 
 App.ServiceConfigGroup.defaultGroupName = 'Default';
 
+App.ServiceConfigGroup.deletedGroupName = 'Deleted';
+
 /**
  * Delete all records with isTemporary:true
  * @method

+ 1 - 1
ambari-web/app/models/configs/service_config_version.js

@@ -54,7 +54,7 @@ App.ServiceConfigVersion = DS.Model.extend({
    * @type {Boolean}
    */
   isConfigGroupDeleted: function () {
-    return this.get('groupName') === 'Deleted';
+    return this.get('groupName') === App.ServiceConfigGroup.deletedGroupName;
   }.property('groupName'),
 
   /**