You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2013/12/10 17:42:08 UTC
git commit: AMBARI-4030 In installer,
duplicating config-group does not duplicate configs. (ababiichuk)
Updated Branches:
refs/heads/trunk e9d546108 -> e45779ab3
AMBARI-4030 In installer, duplicating config-group does not duplicate configs. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e45779ab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e45779ab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e45779ab
Branch: refs/heads/trunk
Commit: e45779ab3b5272221a9b463564317502b29f8a43
Parents: e9d5461
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Tue Dec 10 17:54:28 2013 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Tue Dec 10 18:41:47 2013 +0200
----------------------------------------------------------------------
.../service/manage_config_groups_controller.js | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e45779ab/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
index 194c4f5..67ba9b4 100644
--- a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
+++ b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
@@ -605,7 +605,8 @@ App.InstallerManageConfigGroupsController = App.ManageConfigGroupsController.ext
/**
* add new config group
*/
- addConfigGroup: function () {
+ addConfigGroup: function (duplicated) {
+ duplicated = (duplicated === true);
var self = this;
this.addGroupPopup = App.ModalPopup.show({
primary: Em.I18n.t('ok'),
@@ -614,8 +615,8 @@ App.InstallerManageConfigGroupsController = App.ManageConfigGroupsController.ext
bodyClass: Ember.View.extend({
templateName: require('templates/main/service/new_config_group')
}),
- configGroupName: "",
- configGroupDesc: "",
+ configGroupName: duplicated ? self.get('selectedConfigGroup.name') + ' Copy' : "",
+ configGroupDesc: duplicated ? self.get('selectedConfigGroup.description') + ' (Copy)' : "",
warningMessage: '',
validate: function () {
var warningMessage = '';
@@ -632,6 +633,12 @@ App.InstallerManageConfigGroupsController = App.ManageConfigGroupsController.ext
return false;
}
var defaultConfigGroup = self.get('configGroups').findProperty('isDefault');
+ var properties = [];
+ if (duplicated) {
+ self.get('selectedConfigGroup.properties').forEach(function(property) {
+ properties.push(App.ServiceConfigProperty.create($.extend(true, {},property)));
+ });
+ }
var newConfigGroupData = App.ConfigGroup.create({
id: null,
name: this.get('configGroupName'),
@@ -641,7 +648,7 @@ App.InstallerManageConfigGroupsController = App.ManageConfigGroupsController.ext
service: Em.Object.create({id: self.get('serviceName')}),
hosts: [],
configSiteTags: [],
- properties: []
+ properties: properties
});
self.get('loadedHostsToGroupMap')[newConfigGroupData.get('name')] = [];
self.get('configGroups').pushObject(newConfigGroupData);
@@ -650,6 +657,10 @@ App.InstallerManageConfigGroupsController = App.ManageConfigGroupsController.ext
}
});
},
+
+ duplicateConfigGroup: function() {
+ this.addConfigGroup(true);
+ },
//always enable Save button in Manage Dialog in Installer
isHostsModified: true
})