ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rz...@apache.org
Subject ambari git commit: AMBARI-21371 - Adding ranger failed when user has custom properties (rzang)
Date Wed, 28 Jun 2017 21:34:42 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 b0271155b -> 777434efb


AMBARI-21371 - Adding ranger failed when user has custom properties (rzang)

Change-Id: Ifbf56a692b66e514eb1e010f44e6942f453a3c7b


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

Branch: refs/heads/branch-2.5
Commit: 777434efbc8159f12800eda711258eea11cefcd5
Parents: b027115
Author: Richard Zang <rzang@apache.org>
Authored: Wed Jun 28 14:09:39 2017 -0700
Committer: Richard Zang <rzang@apache.org>
Committed: Wed Jun 28 14:09:39 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/777434ef/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 3e653ae..e86fb59 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -438,8 +438,9 @@ 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(Em.get(p, 'propertyName'),
Em.get(p, 'propertyFileName'));
           stepConfig.get('configs').pushObject(this._createNewProperty(Em.get(p, 'propertyName'),
Em.get(p, 'propertyFileName'),Em.get(p, 'serviceName'),
-              recommended, App.configsCollection.getConfigByName(Em.get(p, 'propertyName'),
Em.get(p, 'propertyFileName')).propertyDependsOn));
+              recommended, stackConfigProperty? stackConfigProperty.propertyDependsOn : []));
         } else {
           Em.set(config, 'value', recommended);
         }


Mime
View raw message