You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2013/11/27 15:23:02 UTC
git commit: AMBARI-3904. Remove/Rename/Duplicate action changes don't
update the link to the Config group. (akovalenko)
Updated Branches:
refs/heads/trunk 1672eac65 -> d8bcb50ab
AMBARI-3904. Remove/Rename/Duplicate action changes don't update the link to the Config group. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d8bcb50a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d8bcb50a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d8bcb50a
Branch: refs/heads/trunk
Commit: d8bcb50aba0e36decf27afb2504136d07329c3c9
Parents: 1672eac
Author: Aleksandr Kovalenko <ol...@ukr.net>
Authored: Wed Nov 27 16:14:22 2013 +0200
Committer: Aleksandr Kovalenko <ol...@ukr.net>
Committed: Wed Nov 27 16:14:22 2013 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/item.js | 4 +---
.../controllers/main/service/manage_config_groups_controller.js | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bcb50a/ambari-web/app/controllers/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/item.js b/ambari-web/app/controllers/main/service/item.js
index 7a860dc..eaf8f02 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -294,12 +294,11 @@ App.MainServiceItemController = Em.Controller.extend({
var mainServiceInfoConfigsController = App.get('router.mainServiceInfoConfigsController');
var selectedConfigGroup = mainServiceInfoConfigsController.get('selectedConfigGroup');
var managedConfigGroups = this.get('subViewController.configGroups');
-
//check whether selectedConfigGroup was selected
if(!selectedConfigGroup){
return;
}
-
+ mainServiceInfoConfigsController.set('configGroups',this.get('subViewController.configGroups'));
if(selectedConfigGroup.isDefault) {
mainServiceInfoConfigsController.set('selectedConfigGroup', managedConfigGroups.findProperty('isDefault', true));
}else{
@@ -310,7 +309,6 @@ App.MainServiceItemController = Em.Controller.extend({
mainServiceInfoConfigsController.set('selectedConfigGroup', managedConfigGroups.findProperty('isDefault', true));
}
}
- mainServiceInfoConfigsController.set('configGroups',this.get('subViewController.configGroups'));
},
updateButtons: function(){
var modified = this.get('subViewController.isHostsModified');
http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bcb50a/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 782752f..222dd87 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
@@ -391,10 +391,10 @@ App.ManageConfigGroupsController = Em.Controller.extend({
var configSiteTags = [];
if (desiredConfigs && desiredConfigs.length > 0) {
desiredConfigs.forEach(function(configs){
- var configSiteTag = {
+ var configSiteTag = App.ConfigSiteTag.create({
site: configs.type,
tag: configs.tag
- }
+ });
configSiteTags.push(configSiteTag);
});
properties = this.get('selectedConfigGroup.properties');