Repository: ambari Updated Branches: refs/heads/branch-2.1 5222188ac -> edc9f4888
AMBARI-12070 In default config group remove config button should not be shown for other groups. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c2dfb9bc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c2dfb9bc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c2dfb9bc Branch: refs/heads/branch-2.1 Commit: c2dfb9bc94de47a67cc93d65f14a598c306b2f44 Parents: c4d2e83 Author: aBabiichuk <[email protected]> Authored: Mon Jun 22 18:52:04 2015 +0300 Committer: aBabiichuk <[email protected]> Committed: Mon Jun 22 18:55:52 2015 +0300 ---------------------------------------------------------------------- .../templates/common/configs/widgets/controls.hbs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c2dfb9bc/ambari-web/app/templates/common/configs/widgets/controls.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/widgets/controls.hbs b/ambari-web/app/templates/common/configs/widgets/controls.hbs index 20651d7..0753860 100644 --- a/ambari-web/app/templates/common/configs/widgets/controls.hbs +++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs @@ -64,14 +64,16 @@ </a> {{/if}} {{#unless view.isOriginalSCP}} - {{#isAccessible ADMIN}} - <a {{bindAttr class=":widget-action :widget-action-remove view.isHover:show:hide"}} href="#" - data-toggle="tooltip" - {{action "removeOverride" view.config target="view.parentView"}} - {{translateAttr data-original-title="common.remove"}}> - <i class="icon-minus-sign"></i> - </a> - {{/isAccessible}} + {{#unless view.disabled}} + {{#isAccessible ADMIN}} + <a {{bindAttr class=":widget-action :widget-action-remove view.isHover:show:hide"}} href="#" + data-toggle="tooltip" + {{action "removeOverride" view.config target="view.parentView"}} + {{translateAttr data-original-title="common.remove"}}> + <i class="icon-minus-sign"></i> + </a> + {{/isAccessible}} + {{/unless}} {{/unless}} {{#if view.overrideAllowed}} {{#isAccessible ADMIN}}
