AMBARI-18875. Cannot delete config groups with no hosts and some config changes (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4f1a7e40 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4f1a7e40 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4f1a7e40 Branch: refs/heads/branch-feature-AMBARI-18634 Commit: 4f1a7e403babb7129c9ca3b4c40a18c97dd6805e Parents: 5d7824e Author: Aleksandr Kovalenko <[email protected]> Authored: Mon Nov 14 16:51:31 2016 +0200 Committer: Aleksandr Kovalenko <[email protected]> Committed: Mon Nov 14 16:51:31 2016 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/main/service/info/configs.js | 2 +- ambari-web/app/mappers/configs/config_groups_mapper.js | 2 +- ambari-web/app/models/configs/config_group.js | 2 ++ ambari-web/app/models/configs/service_config_version.js | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4f1a7e40/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index 946a1b9..130b1b5 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/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) { http://git-wip-us.apache.org/repos/asf/ambari/blob/4f1a7e40/ambari-web/app/mappers/configs/config_groups_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/configs/config_groups_mapper.js b/ambari-web/app/mappers/configs/config_groups_mapper.js index 44bd7a8..8700135 100644 --- a/ambari-web/app/mappers/configs/config_groups_mapper.js +++ b/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 { http://git-wip-us.apache.org/repos/asf/ambari/blob/4f1a7e40/ambari-web/app/models/configs/config_group.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/configs/config_group.js b/ambari-web/app/models/configs/config_group.js index 55ddaad..e2993d8 100644 --- a/ambari-web/app/models/configs/config_group.js +++ b/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 http://git-wip-us.apache.org/repos/asf/ambari/blob/4f1a7e40/ambari-web/app/models/configs/service_config_version.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/configs/service_config_version.js b/ambari-web/app/models/configs/service_config_version.js index 2859030..4120681 100644 --- a/ambari-web/app/models/configs/service_config_version.js +++ b/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'), /**
