ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject ambari git commit: AMBARI-14071. Improve Config groups js code (akovalenko)
Date Wed, 25 Nov 2015 17:20:27 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk a8b285354 -> 65e858ec1


AMBARI-14071. Improve Config groups js code (akovalenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/65e858ec
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/65e858ec
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/65e858ec

Branch: refs/heads/trunk
Commit: 65e858ec116a9831ebf395b3bc8f5ef84b047b23
Parents: a8b2853
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Wed Nov 25 18:15:21 2015 +0200
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Wed Nov 25 18:15:21 2015 +0200

----------------------------------------------------------------------
 .../main/service/manage_config_groups_controller.js          | 2 +-
 .../app/mixins/main/service/configs/config_overridable.js    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/65e858ec/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 f7ae8fd..41934e7 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
@@ -690,7 +690,7 @@ App.ManageConfigGroupsController = Em.Controller.extend(App.ConfigOverridable,
{
           service_id: serviceName,
           service_name: serviceName,
           hosts: [],
-          configSiteTags: [],
+          desiredConfigs: [],
           properties: []
         });
         App.store.commit();

http://git-wip-us.apache.org/repos/asf/ambari/blob/65e858ec/ambari-web/app/mixins/main/service/configs/config_overridable.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/main/service/configs/config_overridable.js b/ambari-web/app/mixins/main/service/configs/config_overridable.js
index fdfa356..824b704 100644
--- a/ambari-web/app/mixins/main/service/configs/config_overridable.js
+++ b/ambari-web/app/mixins/main/service/configs/config_overridable.js
@@ -270,7 +270,7 @@ App.ConfigOverridable = Em.Mixin.create({
    * @method updateConfigurationGroup
    */
   updateConfigurationGroup: function (configGroup, successCallback, errorCallback) {
-    var configSiteTags = configGroup.get('configSiteTags') || [];
+    var desiredConfigs = configGroup.get('desiredConfigs') || [];
     var putConfigGroup = {
       ConfigGroup: {
         group_name: configGroup.get('name'),
@@ -281,10 +281,10 @@ App.ConfigOverridable = Em.Mixin.create({
             host_name: h
           };
         }),
-        desired_configs: configSiteTags.map(function (cst) {
+        desired_configs: desiredConfigs.map(function (cst) {
           return {
-            type: cst.get('site'),
-            tag: cst.get('tag')
+            type: Em.get(cst, 'site') || Em.get(cst, 'type') ,
+            tag: Em.get(cst, 'tag')
           };
         })
       }


Mime
View raw message