Repository: ambari Updated Branches: refs/heads/trunk 61b6a5283 -> a1b6d516c
AMBARI-18084. Install Wizard: Unable to delete custom properties from Misc -> Notifications section (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a1b6d516 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a1b6d516 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a1b6d516 Branch: refs/heads/trunk Commit: a1b6d516c136147cb3acaf65dfe85c0abb9d5426 Parents: 61b6a52 Author: Alex Antonenko <[email protected]> Authored: Tue Aug 9 18:00:06 2016 +0300 Committer: Alex Antonenko <[email protected]> Committed: Tue Aug 9 18:11:06 2016 +0300 ---------------------------------------------------------------------- .../common/configs/notifications_configs.hbs | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a1b6d516/ambari-web/app/templates/common/configs/notifications_configs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/notifications_configs.hbs b/ambari-web/app/templates/common/configs/notifications_configs.hbs index 984bd9a..062a1eb 100644 --- a/ambari-web/app/templates/common/configs/notifications_configs.hbs +++ b/ambari-web/app/templates/common/configs/notifications_configs.hbs @@ -33,23 +33,23 @@ {{view Ember.RadioButton name="createNotification" selectionBinding="view.createNotification" value="yes"}} {{t installer.step7.misc.notification.configure}} </div> - {{#each view.categoryConfigs}} - <div {{bindAttr class=":entry-row rowStyleClass isUserProperty:indent-1"}}> - <span {{bindAttr class="errorMessage:error: :control-group :control-label-span"}}> + {{#each config in view.categoryConfigs}} + <div {{bindAttr class=":entry-row config.rowStyleClass config.isUserProperty:indent-1"}}> + <span {{bindAttr class="config.errorMessage:error: :control-group :control-label-span"}}> <label class="control-label"> - {{formatWordBreak displayName}} + {{formatWordBreak config.displayName}} </label> </span> - <div {{bindAttr class="showLabel:controls"}}> - <div {{bindAttr class="errorMessage:error: warnMessage:warning: :control-group"}}> - {{view viewClass serviceConfigBinding="this" categoryConfigsAllBinding="view.categoryConfigsAll" }} + <div {{bindAttr class="config.showLabel:controls"}}> + <div {{bindAttr class="config.errorMessage:error: config.warnMessage:warning: :control-group"}}> + {{view config.viewClass serviceConfigBinding="config" categoryConfigsAllBinding="view.categoryConfigsAll" }} - {{#if isRemovable}} + {{#if config.isRemovable}} {{#isAuthorized "SERVICE.MODIFY_CONFIGS"}} - {{#unless this.isComparison}} + {{#unless config.isComparison}} <a class="btn-small" href="#" data-toggle="tooltip" - {{action "removeProperty" this target="view"}} + {{action "removeProperty" config target="view"}} {{translateAttr data-original-title="common.remove"}}> <i class="icon-minus-sign"></i> </a> @@ -57,8 +57,8 @@ {{/isAuthorized}} {{/if}} - <span class="help-inline">{{errorMessage}}</span> - <span class="help-inline">{{warnMessage}}</span> + <span class="help-inline">{{config.errorMessage}}</span> + <span class="help-inline">{{config.warnMessage}}</span> </div> </div> </div>
