add resource base permissions (#7202)

GeoNode · Mar 30, 2021 · 8454e63 · 8454e63
1 parent 371d326
commit 8454e63
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/geonode/security/models.py b/geonode/security/models.py
@@ -409,7 +409,7 @@ def get_user_perms(self, user):
             content_type_id=ctype.id,
             user_id=user.id,
             permission__codename__in=resource_perms
-            ).values('permission__codename')
+            ).values_list('permission__codename', flat=True)
 
         return user_resource_perms
 
@@ -426,7 +426,8 @@ def user_can(self, user, permission):
         if any(prefix in permission for prefix in perm_prefixes):
             if config.read_only:
                 return False
-        user_perms = self.get_user_perms(user)
+        resource = self.get_self_resource()
+        user_perms = self.get_user_perms(user).union(resource.get_user_perms(user))
         is_admin = user.is_superuser
         is_staff = user.is_staff
         is_owner = user == self.owner