Repository: ambari Updated Branches: refs/heads/branch-2.4 b8f997c08 -> 8296f0718
AMBARI-17689. JS error when making override (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8296f071 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8296f071 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8296f071 Branch: refs/heads/branch-2.4 Commit: 8296f071893840abeb15c542b7034f1bd79af283 Parents: b8f997c Author: Alex Antonenko <[email protected]> Authored: Wed Jul 13 22:05:21 2016 +0300 Committer: Alex Antonenko <[email protected]> Committed: Thu Jul 14 02:19:09 2016 +0300 ---------------------------------------------------------------------- .../common/configs/config_with_override_recommendation_parser.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8296f071/ambari-web/app/mixins/common/configs/config_with_override_recommendation_parser.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/common/configs/config_with_override_recommendation_parser.js b/ambari-web/app/mixins/common/configs/config_with_override_recommendation_parser.js index c39b9dd..bb39451 100644 --- a/ambari-web/app/mixins/common/configs/config_with_override_recommendation_parser.js +++ b/ambari-web/app/mixins/common/configs/config_with_override_recommendation_parser.js @@ -65,7 +65,9 @@ App.ConfigWithOverrideRecommendationParser = Em.Mixin.create(App.ConfigRecommend * @protected */ _removeOverride: function(property, configs, parentProperties, configGroup) { - this._removeConfigByRecommendation(property.getOverride(configGroup.get('name')), property.get('overrides') || [], parentProperties); + var config = property.getOverride(configGroup.get('name')); + config = config ? config : property; + this._removeConfigByRecommendation(config, property.get('overrides') || [], parentProperties); }, /**
