You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ni...@apache.org on 2020/08/14 14:29:47 UTC

[ranger] 01/02: RANGER-2951 : Ranger's Default Hive Policies on mow-int do not include a database wildcard

This is an automated email from the ASF dual-hosted git repository.

ni3galave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit e6f85bba857175c65e202b1b660b0f50525e83c9
Author: Nitin Galave <ni...@apache.org>
AuthorDate: Fri Aug 14 17:47:06 2020 +0530

    RANGER-2951 : Ranger's Default Hive Policies on mow-int do not include a database wildcard
---
 .../main/webapp/scripts/views/policies/RangerPolicyForm.js  |  6 +++++-
 .../webapp/scripts/views/security_zone/ZoneResourceForm.js  | 13 +++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
index f0b687f..0b64e6a 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
@@ -358,7 +358,11 @@ define(function(require){
 				_.each(this.model.get('resources'),function(obj,key){
 					var resourceDef = _.findWhere(resourceDefList,{'name':key}),
 					sameLevelResourceDef = [], parentResource ;
-					sameLevelResourceDef = _.where(resourceDefList, {'level': resourceDef.level, 'parent' : resourceDef.parent});
+					sameLevelResourceDef = _.filter(resourceDefList, function(objRsc){
+						if (objRsc.level === resourceDef.level && objRsc.parent === resourceDef.parent) {
+							return objRsc
+						}
+					});
 					//for parent leftnode status
                     if(resourceDef.parent){
                     	parentResource = _.findWhere(resourceDefList ,{'name':resourceDef.parent});
diff --git a/security-admin/src/main/webapp/scripts/views/security_zone/ZoneResourceForm.js b/security-admin/src/main/webapp/scripts/views/security_zone/ZoneResourceForm.js
index dbd1a3f..a23c744 100644
--- a/security-admin/src/main/webapp/scripts/views/security_zone/ZoneResourceForm.js
+++ b/security-admin/src/main/webapp/scripts/views/security_zone/ZoneResourceForm.js
@@ -107,12 +107,13 @@ define(function(require) {
                     _.each(this.model.get('resources'), function(obj, key) {
                         var resourceDef = _.findWhere(resourceDefList, {
                                 'name': key
-                            }),
-                            sameLevelResourceDef = [],
-                            parentResource;
-                        sameLevelResourceDef = _.where(resourceDefList, {
-                            'level': resourceDef.level,
-                            'parent': resourceDef.parent
+                        }),
+                        sameLevelResourceDef = [],
+                        parentResource;
+                        sameLevelResourceDef = _.filter(resourceDefList, function(objRsc){
+                            if (objRsc.level === resourceDef.level && objRsc.parent === resourceDef.parent) {
+                                return objRsc
+                            }
                         });
                         //for parent leftnode status
                         if (resourceDef.parent) {