소스 검색

AMBARI-19542: Cannot change group/user privileges in list view if the user has VIEW.USER privilege (sangeetar)

Sangeeta Ravindran 8 년 전
부모
커밋
8a4439e554
1개의 변경된 파일10개의 추가작업 그리고 6개의 파일을 삭제
  1. 10 6
      ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js

+ 10 - 6
ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js

@@ -148,10 +148,12 @@ function($scope, $location, Cluster, $modal, $rootScope, $routeParams, Permissio
         var privilegesOfTypeUser = [];
         var privilegesOfTypeGroup = [];
         for (var i = 0; i < arrayOfPrivileges.length; i++) {
-          if(arrayOfPrivileges[i].PrivilegeInfo.principal_type === "GROUP"){
-            privilegesOfTypeGroup.push(arrayOfPrivileges[i]);
-          } else {
-            privilegesOfTypeUser.push(arrayOfPrivileges[i].PrivilegeInfo);
+          if(arrayOfPrivileges[i].PrivilegeInfo.permission_name != "VIEW.USER") {
+            if(arrayOfPrivileges[i].PrivilegeInfo.principal_type === "GROUP"){
+              privilegesOfTypeGroup.push(arrayOfPrivileges[i]);
+            } else {
+              privilegesOfTypeUser.push(arrayOfPrivileges[i].PrivilegeInfo);
+            }
           }
         }
 
@@ -204,8 +206,10 @@ function($scope, $location, Cluster, $modal, $rootScope, $routeParams, Permissio
         user.editable = (Cluster.ineditableRoles.indexOf(privilege.permission_name) === -1);
 
         arrayOfPrivileges.forEach(function(privilegeOfTypeGroup) {
-          if (privilegeOfTypeGroup.PrivilegeInfo.principal_type === "GROUP") {
-            privilegesOfTypeGroup.push(privilegeOfTypeGroup.PrivilegeInfo);
+          if(privilegeOfTypeGroup.PrivilegeInfo.permission_name != "VIEW.USER") {
+            if (privilegeOfTypeGroup.PrivilegeInfo.principal_type === "GROUP") {
+              privilegesOfTypeGroup.push(privilegeOfTypeGroup.PrivilegeInfo);
+            }
           }
         });