ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lpus...@apache.org
Subject [15/36] ambari git commit: AMBARI-21371 - Adding ranger failed when user has custom properties (rzang)
Date Tue, 04 Jul 2017 16:18:38 GMT
AMBARI-21371 - Adding ranger failed when user has custom properties (rzang)

Change-Id: I3b73ade85c7818939e6c384f8b6bcc9966b448cb


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 9d224f73b68279bcec834a28c35dd76122d9e73d
Parents: 2f0de69
Author: Richard Zang <rzang@apache.org>
Authored: Wed Jun 28 13:50:38 2017 -0700
Committer: Richard Zang <rzang@apache.org>
Committed: Wed Jun 28 13:50:38 2017 -0700

----------------------------------------------------------------------
 ambari-web/app/mixins/common/configs/enhanced_configs.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/9d224f73/ambari-web/app/mixins/common/configs/enhanced_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index 4561f77..8fc7a4c 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -553,12 +553,13 @@ App.EnhancedConfigsMixin = Em.Mixin.create(App.ConfigWithOverrideRecommendationP
     if (Em.isNone(recommended)) {
       stepConfig.get('configs').removeObject(config);
     } else if (Em.isNone(initial)) {
+      var stackConfigProperty = App.configsCollection.getConfigByName(name, filename);
       stepConfig.get('configs').pushObject(this._createNewProperty(
         name,
         filename,
         Em.get(prop, 'serviceName'),
         recommended,
-        App.configsCollection.getConfigByName(name, filename).propertyDependsOn));
+        stackConfigProperty? stackConfigProperty.propertyDependsOn : []));
     } else {
       Em.set(config, 'value', recommended);
     }


Mime
View raw message