ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sangee...@apache.org
Subject ambari git commit: AMBARI-20925: Service Auto-Start behavior is incorrect for Service Administrator and Service Operator Roles (sangeetar)
Date Fri, 05 May 2017 19:06:28 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 f740a9fdd -> d8f7d3ae3


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/d8f7d3ae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d8f7d3ae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d8f7d3ae

Branch: refs/heads/branch-2.5
Commit: d8f7d3ae34233378e6eb52db6b0d316d4d906db2
Parents: f740a9f
Author: Sangeeta Ravindran <sangeetar@apache.org>
Authored: Fri May 5 12:06:12 2017 -0700
Committer: Sangeeta Ravindran <sangeetar@apache.org>
Committed: Fri May 5 12:06:12 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/d8f7d3ae/ambari-web/app/routes/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index 35f637c..02b561d 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -564,7 +564,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
     adminServiceAutoStart: Em.Route.extend({
       route: '/serviceAutoStart',
       enter: function(router, transition) {
-        if (router.get('loggedIn') && !App.isAuthorized('CLUSTER.MANAGE_AUTO_START')
&& !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/d8f7d3ae/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/d8f7d3ae/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 f60ae8a..00b1c38 100644
--- a/ambari-web/app/views/main/menu.js
+++ b/ambari-web/app/views/main/menu.js
@@ -128,7 +128,7 @@ App.MainMenuView = Em.CollectionView.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) {
             categories.push({
               name: 'serviceAutoStart',


Mime
View raw message