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-19169. Add Service Page in Atlas doesn't show config on change (akovalenko)
Date Mon, 12 Dec 2016 19:06:31 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 f570eae37 -> 41838162f


AMBARI-19169. Add Service Page in Atlas doesn't show config on change (akovalenko)


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

Branch: refs/heads/branch-2.5
Commit: 41838162f55129f153cc358ba5d360cda62bb5ae
Parents: f570eae
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Mon Dec 12 18:52:57 2016 +0200
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Mon Dec 12 21:06:18 2016 +0200

----------------------------------------------------------------------
 .../views/common/configs/service_configs_by_category_view.js   | 6 +++++-
 .../app/views/common/configs/widgets/config_widget_view.js     | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/41838162/ambari-web/app/views/common/configs/service_configs_by_category_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/service_configs_by_category_view.js b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
index b8a0d1f..6305cfe 100644
--- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
+++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
@@ -95,7 +95,11 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri
   },
 
   setVisibleCategoryConfigsOnce: function () {
-    Em.run.once(this, 'addConfigToCategoryConfigs');
+    if (this.get('controller.isChangingConfigAttributes')) {
+      this.setVisibleCategoryConfigs();
+    } else {
+      Em.run.once(this, 'addConfigToCategoryConfigs');
+    }
   }.observes('categoryConfigsAll.@each.isVisible'),
 
   setCategoryConfigsAll: function () {

http://git-wip-us.apache.org/repos/asf/ambari/blob/41838162/ambari-web/app/views/common/configs/widgets/config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/config_widget_view.js b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
index da4ed6c..e93baa2 100644
--- a/ambari-web/app/views/common/configs/widgets/config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
@@ -529,6 +529,7 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
     var serviceConfigs = this.get('controller.stepConfigs').findProperty('serviceName',serviceName).get('configs');
     var action = isConditionTrue ? configCondition.get("then") : configCondition.get("else");
     var valueAttributes = action.property_value_attributes;
+    this.set('controller.isChangingConfigAttributes', true);
     for (var key in valueAttributes) {
       if (valueAttributes.hasOwnProperty(key)) {
         var valueAttribute = App.StackConfigValAttributesMap[key] || key;
@@ -541,6 +542,7 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
         }
       }
     }
+    this.set('controller.isChangingConfigAttributes', false);
   },
 
   /**


Mime
View raw message