fix: realign changes with upstream

flaxandteal · Oct 6, 2024 · 16c4573 · 16c4573
1 parent 2887b01
commit 16c4573
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 793 deletions.
diff --git a/arches/app/permissions/arches_permission_base.py b/arches/app/permissions/arches_permission_base.py
@@ -34,7 +34,7 @@
 import guardian.shortcuts as gsc
 
 import inspect
-from arches.app.models.models import Node, NodeGroup, TileModel
+from arches.app.models.models import Node, NodeGroup, TileModel, Plugin
 from django.db.models import Q
 from arches.app.models.system_settings import settings
 from arches.app.models.models import ResourceInstance, MapLayer
@@ -317,13 +317,7 @@ def user_has_plugin_permissions(self, user: User, plugin: Plugin | uuid.UUID | s
             perms = (perms,)
         return all(user.has_perm(perm, plugin_obj) for perm in perms)
 
-    def user_has_resource_model_permissions(
-        self,
-        user: User,
-        perms: str | Iterable[str],
-        resource: ResourceInstance | None = None,
-        graph_id: str | None = None,
-    ) -> bool:
+    def user_has_resource_model_permissions(self, user: User, perms: str | Iterable[str], resource: ResourceInstance | None=None, graph_id: str | None=None) -> bool:
         """
         Checks if a user has any explicit permissions to a model's nodegroups