AMBARI-20925: Service Auto-Start behavior is incorrect for Service Administrator and Service Operator Roles (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2b676c18 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2b676c18 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2b676c18 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 2b676c1829560c91ccafd8510a3202e61730ff66 Parents: 57359c9 Author: Sangeeta Ravindran <sangee...@apache.org> Authored: Fri May 5 10:21:11 2017 -0700 Committer: Sangeeta Ravindran <sangee...@apache.org> Committed: Fri May 5 10:21:11 2017 -0700 ---------------------------------------------------------------------- ambari-web/app/routes/main.js | 2 +- ambari-web/app/views/main/admin.js | 2 +- ambari-web/app/views/main/menu.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2b676c18/ambari-web/app/routes/main.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js index 1f881e0..30cc8aa 100644 --- a/ambari-web/app/routes/main.js +++ b/ambari-web/app/routes/main.js @@ -653,7 +653,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, { route: '/serviceAutoStart', enter: function(router, transition) { - if (router.get('loggedIn') && !App.isAuthorized('CLUSTER.MANAGE_AUTO_START')) { + if (router.get('loggedIn') && !App.isAuthorized('CLUSTER.MANAGE_AUTO_START') && !App.isAuthorized('SERVICE.MANAGE_AUTO_START')) { router.transitionTo('main.dashboard.index'); } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/2b676c18/ambari-web/app/views/main/admin.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin.js b/ambari-web/app/views/main/admin.js index 0fa84e8..509f380 100644 --- a/ambari-web/app/views/main/admin.js +++ b/ambari-web/app/views/main/admin.js @@ -46,7 +46,7 @@ App.MainAdminView = Em.View.extend({ disabled: App.get('upgradeInProgress') || App.get('upgradeHolding') }); } - if (App.isAuthorized('SERVICE.START_STOP, CLUSTER.MODIFY_CONFIGS') || (App.get('upgradeInProgress') || App.get('upgradeHolding'))) { + if ((App.isAuthorized('SERVICE.START_STOP, CLUSTER.MODIFY_CONFIGS') && App.isAuthorized('SERVICE.MANAGE_AUTO_START, CLUSTER.MANAGE_AUTO_START')) || (App.get('upgradeInProgress') || App.get('upgradeHolding'))) { if (App.supports.serviceAutoStart) { items.push({ name: 'serviceAutoStart', http://git-wip-us.apache.org/repos/asf/ambari/blob/2b676c18/ambari-web/app/views/main/menu.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/menu.js b/ambari-web/app/views/main/menu.js index 6e79aba..feb3baf 100644 --- a/ambari-web/app/views/main/menu.js +++ b/ambari-web/app/views/main/menu.js @@ -115,7 +115,7 @@ App.MainSideMenuView = Em.CollectionView.extend({ href: router.urlFor('main.admin.adminKerberos') }); } - if (App.isAuthorized('SERVICE.START_STOP, CLUSTER.MODIFY_CONFIGS') || upg) { + if ((App.isAuthorized('SERVICE.START_STOP, CLUSTER.MODIFY_CONFIGS') && App.isAuthorized('SERVICE.MANAGE_AUTO_START, CLUSTER.MANAGE_AUTO_START')) || upg) { if (App.supports.serviceAutoStart) { categories.push({ name: 'serviceAutoStart',
