Repository: ambari Updated Branches: refs/heads/branch-2.5 0c9e3a75b -> b53fc82a7
AMBARI-20194 - Enable/Disable UI objects related to managing alert targets based on user's privileges <fix1>(rzang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b53fc82a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b53fc82a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b53fc82a Branch: refs/heads/branch-2.5 Commit: b53fc82a7184fb8b54c290b523f9146c19227a87 Parents: 0c9e3a7 Author: Richard Zang <[email protected]> Authored: Tue Feb 28 12:52:12 2017 -0800 Committer: Richard Zang <[email protected]> Committed: Tue Feb 28 13:01:43 2017 -0800 ---------------------------------------------------------------------- ambari-web/app/app.js | 2 +- .../alerts/alert_definitions_actions_controller.js | 2 +- .../main/alerts/manage_alert_notifications_popup.hbs | 5 ++--- .../main/alerts/manage_alert_notifications_view.js | 10 ++++++---- .../alerts/manage_alert_notifications_view_test.js | 14 -------------- 5 files changed, 10 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b53fc82a/ambari-web/app/app.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js index 86c4045..18d0cba 100644 --- a/ambari-web/app/app.js +++ b/ambari-web/app/app.js @@ -38,7 +38,7 @@ module.exports = Em.Application.create({ isOperator: false, isClusterUser: false, isPermissionDataLoaded: false, - auth: null, + auth: undefined, isOnlyViewUser: function() { return App.auth && (App.auth.length == 0 || (App.isAuthorized('VIEW.USE') && App.auth.length == 1)); }.property('auth'), http://git-wip-us.apache.org/repos/asf/ambari/blob/b53fc82a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js b/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js index 863855c..65b2f45 100644 --- a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js +++ b/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js @@ -57,7 +57,7 @@ App.MainAlertDefinitionActionsController = Em.ArrayController.extend({ showDivider: false }); return content; - }.property('App.supports.createAlerts'), + }.property('App.supports.createAlerts', 'App.auth'), /** * Common handler for menu item click http://git-wip-us.apache.org/repos/asf/ambari/blob/b53fc82a/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs b/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs index 854d768..da8faa8 100644 --- a/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs +++ b/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs @@ -32,16 +32,15 @@ <div class="btn-toolbar pull-right"> <button rel="button-info" class="btn add-notification-button" {{translateAttr data-original-title="alerts.actions.manage_alert_notifications_popup.addButton"}} - {{bindAttr disabled="view.isAddButtonDisabled"}} {{action addAlertNotification target="controller"}}><i class="icon-plus"></i></button> <button rel="button-info" class="btn remove-notification-button" {{translateAttr data-original-title="alerts.actions.manage_alert_notifications_popup.removeButton"}} {{bindAttr disabled="view.isRemoveButtonDisabled"}} {{action deleteAlertNotification target="controller"}}><i class="icon-minus"></i></button> <div class="btn-group notification-actions-button"> - <button class="btn dropdown-toggle" data-toggle="dropdown" {{bindAttr disabled="view.isAddButtonDisabled"}}> + <button class="btn dropdown-toggle" data-toggle="dropdown"> <i class="icon-cog"></i> <span class="caret"></span> - </button> + </button> <ul class="dropdown-menu"> <li {{bindAttr class="view.isEditButtonDisabled:disabled"}}> <a href="" rel="button-info-dropdown" http://git-wip-us.apache.org/repos/asf/ambari/blob/b53fc82a/ambari-web/app/views/main/alerts/manage_alert_notifications_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/alerts/manage_alert_notifications_view.js b/ambari-web/app/views/main/alerts/manage_alert_notifications_view.js index 75912b7..aa05f86 100644 --- a/ambari-web/app/views/main/alerts/manage_alert_notifications_view.js +++ b/ambari-web/app/views/main/alerts/manage_alert_notifications_view.js @@ -36,22 +36,24 @@ App.ManageAlertNotificationsView = Em.View.extend({ /** * @type {boolean} */ - isAddButtonDisabled: Em.computed.alias('App.isOperator'), + isEditButtonDisabled: Em.computed.or('!someAlertNotificationIsSelected', '!controller.selectedAlertNotification.enabled'), /** * @type {boolean} */ - isEditButtonDisabled: Em.computed.or('!someAlertNotificationIsSelected', 'App.isOperator'), + + isRemoveButtonDisabled: Em.computed.or('!someAlertNotificationIsSelected'), /** * @type {boolean} */ - isRemoveButtonDisabled: Em.computed.or('!someAlertNotificationIsSelected', 'App.isOperator'), + isDuplicateButtonDisabled: Em.computed.or('!someAlertNotificationIsSelected', '!controller.selectedAlertNotification.enabled'), /** * @type {boolean} */ - isDuplicateButtonDisabled: Em.computed.or('!someAlertNotificationIsSelected', 'App.isOperator'), + + isEnableOrDisableButtonDisabled: Em.computed.or('!someAlertNotificationIsSelected'), /** * Show EMAIL information if selected alert notification has type EMAIL http://git-wip-us.apache.org/repos/asf/ambari/blob/b53fc82a/ambari-web/test/views/main/alerts/manage_alert_notifications_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/alerts/manage_alert_notifications_view_test.js b/ambari-web/test/views/main/alerts/manage_alert_notifications_view_test.js index cebee96..f7df4be 100644 --- a/ambari-web/test/views/main/alerts/manage_alert_notifications_view_test.js +++ b/ambari-web/test/views/main/alerts/manage_alert_notifications_view_test.js @@ -224,20 +224,6 @@ describe('App.ManageAlertNotificationsView', function () { view.onLoad(); expect(view.get('selectedAlertNotification')).to.be.null; }); - - it("isAddButtonDisabled should be true", function () { - view.set('isAddButtonDisabled', true); - App.set('isOperator', true); - view.onLoad(); - expect(view.get('isAddButtonDisabled')).to.be.true; - }); - - it("isAddButtonDisabled should be false", function () { - view.set('isAddButtonDisabled', true); - App.set('isOperator', false); - view.onLoad(); - expect(view.get('isAddButtonDisabled')).to.be.false; - }); }); describe("controller.isLoaded is true, alertNotifications is array", function () {
