Repository: ambari Updated Branches: refs/heads/branch-2.4 09050cb09 -> a7edab221
AMBARI-17141 "Settings" button shown to cluster administrator. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a7edab22 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a7edab22 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a7edab22 Branch: refs/heads/branch-2.4 Commit: a7edab2211856e096514bb0dd4db920d5d4d836c Parents: 09050cb Author: Andrii Tkach <[email protected]> Authored: Thu Jun 9 13:43:27 2016 +0300 Committer: Andrii Tkach <[email protected]> Committed: Thu Jun 9 16:57:31 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/templates/application.hbs | 2 +- ambari-web/app/templates/common/modal_popup.hbs | 8 ++++---- ambari-web/app/utils/host_progress_popup.js | 7 ------- 3 files changed, 5 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a7edab22/ambari-web/app/templates/application.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/application.hbs b/ambari-web/app/templates/application.hbs index 9c17223..93f0681 100644 --- a/ambari-web/app/templates/application.hbs +++ b/ambari-web/app/templates/application.hbs @@ -81,7 +81,7 @@ {{/if}} {{/if}} {{#if isExistingClusterDataLoaded}} - {{#isAuthorized "CLUSTER.UPGRADE_DOWNGRADE_STACK"}} + {{#isAuthorized "AMBARI.MANAGE_SETTINGS"}} <li><a href="" {{action showSettingsPopup target="App.router.userSettingsController"}}>{{t app.settings}}</a></li> {{/isAuthorized}} {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/a7edab22/ambari-web/app/templates/common/modal_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popup.hbs b/ambari-web/app/templates/common/modal_popup.hbs index e4537e9..2e6d13e 100644 --- a/ambari-web/app/templates/common/modal_popup.hbs +++ b/ambari-web/app/templates/common/modal_popup.hbs @@ -47,10 +47,10 @@ {{view view.footerClass}} {{else}} <div class="modal-footer"> - {{#if view.hasFooterCheckbox}} - <label id="footer-checkbox">{{view Ember.Checkbox classNames="checkbox" checkedBinding="view.isNotShowBgChecked"}} - {{t app.settings.notShowBgOperations}}</label> - {{/if}} + {{#isAuthorized "AMBARI.MANAGE_SETTINGS"}} + <label id="footer-checkbox">{{view Ember.Checkbox classNames="checkbox" checkedBinding="view.isNotShowBgChecked"}} + {{t app.settings.notShowBgOperations}}</label> + {{/isAuthorized}} {{#if view.third}} <button {{bindAttr disabled="view.disableThird" class=":btn view.thirdClass"}} {{action onThird target="view"}}>{{view.third}}</button> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/a7edab22/ambari-web/app/utils/host_progress_popup.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/host_progress_popup.js b/ambari-web/app/utils/host_progress_popup.js index 20ea220..6e0dd2f 100644 --- a/ambari-web/app/utils/host_progress_popup.js +++ b/ambari-web/app/utils/host_progress_popup.js @@ -851,13 +851,6 @@ App.HostPopup = Em.Object.create({ classNames: ['sixty-percent-width-modal', 'host-progress-popup', 'full-height-modal'], /** - * for the checkbox: do not show this dialog again - * - * @type {bool} - */ - hasFooterCheckbox: true, - - /** * Auto-display BG-popup * * @type {bool}
