Updated Branches: refs/heads/trunk 2e6a9642e -> 679c6ee23
AMBARI-3946. Install Wizard: not possible to remove config overrides. (Denys Buzhor via akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/679c6ee2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/679c6ee2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/679c6ee2 Branch: refs/heads/trunk Commit: 679c6ee23d9df369c70c7b151ee73d3bc2cf9ab9 Parents: 2e6a964 Author: Aleksandr Kovalenko <[email protected]> Authored: Mon Dec 2 18:53:10 2013 +0200 Committer: Aleksandr Kovalenko <[email protected]> Committed: Mon Dec 2 18:53:10 2013 +0200 ---------------------------------------------------------------------- ambari-web/app/views/common/configs/overriddenProperty_view.js | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/679c6ee2/ambari-web/app/views/common/configs/overriddenProperty_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/overriddenProperty_view.js b/ambari-web/app/views/common/configs/overriddenProperty_view.js index 298d32c..1d2ae3a 100644 --- a/ambari-web/app/views/common/configs/overriddenProperty_view.js +++ b/ambari-web/app/views/common/configs/overriddenProperty_view.js @@ -33,6 +33,12 @@ App.ServiceConfigView.SCPOverriddenRowsView = Ember.View.extend({ // arg 1 SCP means ServiceConfigProperty var scpToBeRemoved = event.contexts[0]; var overrides = this.get('serviceConfigProperty.overrides'); + // remove override property from selectedService on installer 7-th step + if (this.get('controller.name') == 'wizardStep7Controller') { + var controller = this.get('controller'); + var group = controller.get('selectedService.configGroups').findProperty('name', controller.get('selectedConfigGroup.name')); + group.get('properties').removeObject(scpToBeRemoved); + } overrides = overrides.without(scpToBeRemoved); this.set('serviceConfigProperty.overrides', overrides); }
