Repository: ambari Updated Branches: refs/heads/trunk f0809e2a3 -> 1d050d21c
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/1d050d21 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1d050d21 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1d050d21 Branch: refs/heads/trunk Commit: 1d050d21c9bbaf8e2a743c8b1bda3c5e3b5d5cd8 Parents: f0809e2 Author: Alex Antonenko <[email protected]> Authored: Wed Jul 13 22:05:21 2016 +0300 Committer: Alex Antonenko <[email protected]> Committed: Thu Jul 14 02:18:10 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/1d050d21/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); }, /**
