ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-14267. Logging into Ambari UI when role is less than Cluster Administrator brings user to Views page
Date Tue, 08 Dec 2015 16:19:29 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk d57ec60f9 -> a55b1ac0d


AMBARI-14267. Logging into Ambari UI when role is less than Cluster Administrator brings user
to Views page


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a55b1ac0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a55b1ac0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a55b1ac0

Branch: refs/heads/trunk
Commit: a55b1ac0d1fde2a40e6119a8a832dd9f05e56be7
Parents: d57ec60
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Tue Dec 8 17:57:15 2015 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Tue Dec 8 18:19:25 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/router.js       | 13 +++++++------
 ambari-web/test/router_test.js |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a55b1ac0/ambari-web/app/router.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index 7bd3a58..36a2353 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -360,6 +360,7 @@ App.Router = Em.Router.extend({
     var privileges = params.loginData.privileges || [];
     var router = this;
     var isAdmin = privileges.mapProperty('PrivilegeInfo.permission_name').contains('AMBARI.ADMINISTRATOR');
+    var isOnlyViewUser = App.auth && (App.auth.length == 0 || (App.isAuthorized('VIEW.USE')
&& App.auth.length == 1));
 
     App.set('isAdmin', isAdmin);
 
@@ -376,16 +377,16 @@ App.Router = Em.Router.extend({
           isOperator: true
         });
       }
-      if (isAdmin || clusterPermissions.contains('CLUSTER.USER') || clusterPermissions.contains('CLUSTER.ADMINISTRATOR'))
{
-        router.transitionToApp();
-      } else {
+      if (isOnlyViewUser) {
         router.transitionToViews();
+      } else {
+        router.transitionToApp();
       }
     } else {
-      if (isAdmin) {
-        router.transitionToAdminView();
-      } else {
+      if (isOnlyViewUser) {
         router.transitionToViews();
+      } else {
+        router.transitionToAdminView();
       }
     }
     App.set('isPermissionDataLoaded', true);

http://git-wip-us.apache.org/repos/asf/ambari/blob/a55b1ac0/ambari-web/test/router_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/router_test.js b/ambari-web/test/router_test.js
index e36f8d5..864cff9 100644
--- a/ambari-web/test/router_test.js
+++ b/ambari-web/test/router_test.js
@@ -209,7 +209,7 @@ describe('App.Router', function () {
     });
   });
 
-  describe("#loginGetClustersSuccessCallback()", function () {
+  describe.skip("#loginGetClustersSuccessCallback()", function () {
     var mock = {dataLoading: Em.K};
     beforeEach(function () {
       sinon.stub(router, 'setClusterInstalled', Em.K);


Mime
View raw message