[Fixes #12713] fix PR comments

Author: mattiagiupponi

geonode/base/api/permissions.py

@@ -252,8 +252,6 @@ def has_permission(self, request, view):
             # getting the user permission for that resource
             available_perms = permissions_registry.get_perms(instance=res, user=request.user)
 
-            if request.user.has_perm("base.add_resourcebase"):
-                available_perms.append("add_resourcebase")
             # fixup the permissions name
             perms_without_base = [x.replace("base.", "") for x in perms]
             # if at least one of the permissions is available the request is True

geonode/base/api/tests.py

@@ -2374,10 +2374,8 @@ def test_resource_service_copy_with_perms_dataset_set_default_perms(self):
             }
             resource.set_permissions(_perms)
             # checking that bobby is in the original dataset perms list
-            self.assertTrue(
-                "bobby"
-                in "bobby"
-                in [x.username for x in permissions_registry.get_perms(instance=resource).get("users", [])]
+            self.assertIn(
+                "bobby", [x.username for x in permissions_registry.get_perms(instance=resource).get("users", [])]
             )
             # copying the resource, should remove the perms for bobby
             # only the default perms should be available

geonode/geoserver/tests/integration.py

@@ -353,4 +353,3 @@ def test_default_anonymous_permissions(self):
 
     def get_user_resource_perms(self, instance, user):
         return permissions_registry.get_perms(instance=instance, user=user)
-        # return list(instance.get_user_perms(user).union(instance.get_self_resource().get_user_perms(user)))

geonode/security/registry.py

@@ -62,12 +62,13 @@ def fixup_perms(self, instance, payload, include_virtual=True, *args, **kwargs):
             payload = handler.fixup_perms(instance, payload, include_virtual=include_virtual, *args, **kwargs)
         return payload
 
-    def get_perms(self, instance, user=None, include_virtual=True, *args, **kwargs):
+    def get_perms(self, instance, user=None, include_virtual=True, include_alias=False, *args, **kwargs):
         """
         Return the payload with the permissions from the handlers.
         The permissions payload can be edited by each permissions handler.
         For example before return the payload, we can virtually remove perms
         to the resource
+        Include_alias -> If true returns the permissions including the add_resorucebase if the user has
         """
         if user:
             payload = {"users": {user: instance.get_user_perms(user)}, "groups": {}}
@@ -78,6 +79,8 @@ def get_perms(self, instance, user=None, include_virtual=True, *args, **kwargs):
             payload = handler.get_perms(instance, payload, user, include_virtual=include_virtual, *args, **kwargs)
 
         if user:
+            if user.has_perm("base.add_resourcebase"):
+                payload["users"][user].extend(["add_resourcebase"])
             return payload["users"][user]
         return payload