wbcore 1.61.3__py2.py3-none-any.whl → 1.61.5__py2.py3-none-any.whl

wbcore/contrib/{guardian → permission}/viewsets/mixins.py

@@ -1,6 +1,6 @@
-from wbcore.contrib.guardian.filters import ObjectPermissionsFilter
+from wbcore.contrib.permission.filters import ObjectPermissionsFilter
 from wbcore.viewsets.mixins import FilterMixin
 
 
-class GuardianFilterMixin(FilterMixin):
+class ObjectPermissionFilterMixin(FilterMixin):
     filter_backends = (ObjectPermissionsFilter, *FilterMixin.filter_backends)

wbcore/contrib/{guardian → permission}/viewsets/viewsets.py

@@ -7,8 +7,8 @@ from rest_framework.exceptions import ValidationError
 from wbcore import serializers, viewsets
 from wbcore.contrib.authentication.models.users import Permission, User
 from wbcore.contrib.authentication.serializers import UserRepresentationSerializer
-from wbcore.contrib.guardian.models import UserObjectPermission
-from wbcore.contrib.guardian.viewsets.configs import (
+from wbcore.contrib.permission.models import UserObjectPermission
+from wbcore.contrib.permission.viewsets.configs import (
     PivotUserObjectPermissionButtonViewConfig,
     PivotUserObjectPermissionDisplayViewConfig,
     PivotUserObjectPermissionEndpointViewConfig,

wbcore/contrib/workflow/viewsets/menu/condition.py

@@ -1,19 +1,18 @@
 from django.utils.translation import gettext as _
 
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 CONDITION_MENUITEM = MenuItem(
     label=_("Condition"),
     endpoint="wbcore:workflow:condition-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_condition"]
+        method=lambda request: request.user.is_internal, permissions=["workflow.view_condition"]
     ),
     add=MenuItem(
         label=_("Create Condition"),
         endpoint="wbcore:workflow:condition-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["workflow.add_condition"]
+            method=lambda request: request.user.is_internal, permissions=["workflow.add_condition"]
         ),
     ),
 )

wbcore/contrib/workflow/viewsets/menu/data.py

@@ -1,19 +1,14 @@
 from django.utils.translation import gettext as _
 
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 DATA_MENUITEM = MenuItem(
     label=_("Data"),
     endpoint="wbcore:workflow:data-list",
-    permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_data"]
-    ),
+    permission=ItemPermission(method=lambda request: request.user.is_internal, permissions=["workflow.view_data"]),
     add=MenuItem(
         label=_("Create Data"),
         endpoint="wbcore:workflow:data-list",
-        permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["workflow.add_data"]
-        ),
+        permission=ItemPermission(method=lambda request: request.user.is_internal, permissions=["workflow.add_data"]),
     ),
 )

wbcore/contrib/workflow/viewsets/menu/process.py

@@ -1,19 +1,16 @@
 from django.utils.translation import gettext as _
 
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 PROCESS_MENUITEM = MenuItem(
     label=_("Process"),
     endpoint="wbcore:workflow:process-list",
-    permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_process"]
-    ),
+    permission=ItemPermission(method=lambda request: request.user.is_internal, permissions=["workflow.view_process"]),
 )
 PROCESSSTEP_MENUITEM = MenuItem(
     label=_("Process Step"),
     endpoint="wbcore:workflow:processstep-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_processstep"]
+        method=lambda request: request.user.is_internal, permissions=["workflow.view_processstep"]
     ),
 )

wbcore/contrib/workflow/viewsets/menu/step.py

@@ -1,19 +1,18 @@
 from django.utils.translation import gettext as _
 
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 STARTSTEP_MENUITEM = MenuItem(
     label=_("Start Step"),
     endpoint="wbcore:workflow:startstep-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_startstep"]
+        method=lambda request: request.user.is_internal, permissions=["workflow.view_startstep"]
     ),
     add=MenuItem(
         label=_("Create Start Step"),
         endpoint="wbcore:workflow:startstep-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["workflow.add_startstep"]
+            method=lambda request: request.user.is_internal, permissions=["workflow.add_startstep"]
         ),
     ),
 )
@@ -21,14 +20,12 @@ STARTSTEP_MENUITEM = MenuItem(
 USERSTEP_MENUITEM = MenuItem(
     label=_("User Step"),
     endpoint="wbcore:workflow:userstep-list",
-    permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_userstep"]
-    ),
+    permission=ItemPermission(method=lambda request: request.user.is_internal, permissions=["workflow.view_userstep"]),
     add=MenuItem(
         label=_("Create User Step"),
         endpoint="wbcore:workflow:userstep-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["workflow.add_userstep"]
+            method=lambda request: request.user.is_internal, permissions=["workflow.add_userstep"]
         ),
     ),
 )
@@ -37,13 +34,13 @@ DECISIONSTEP_MENUITEM = MenuItem(
     label=_("Decision Step"),
     endpoint="wbcore:workflow:decisionstep-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_decisionstep"]
+        method=lambda request: request.user.is_internal, permissions=["workflow.view_decisionstep"]
     ),
     add=MenuItem(
         label=_("Create Decision Step"),
         endpoint="wbcore:workflow:decisionstep-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["workflow.add_decisionstep"]
+            method=lambda request: request.user.is_internal, permissions=["workflow.add_decisionstep"]
         ),
     ),
 )
@@ -52,13 +49,13 @@ SPLITSTEP_MENUITEM = MenuItem(
     label=_("Split Step"),
     endpoint="wbcore:workflow:splitstep-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_splitstep"]
+        method=lambda request: request.user.is_internal, permissions=["workflow.view_splitstep"]
     ),
     add=MenuItem(
         label=_("Create Split Step"),
         endpoint="wbcore:workflow:splitstep-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["workflow.add_splitstep"]
+            method=lambda request: request.user.is_internal, permissions=["workflow.add_splitstep"]
         ),
     ),
 )
@@ -66,14 +63,12 @@ SPLITSTEP_MENUITEM = MenuItem(
 JOINSTEP_MENUITEM = MenuItem(
     label=_("Join Step"),
     endpoint="wbcore:workflow:joinstep-list",
-    permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_joinstep"]
-    ),
+    permission=ItemPermission(method=lambda request: request.user.is_internal, permissions=["workflow.view_joinstep"]),
     add=MenuItem(
         label=_("Create Join Step"),
         endpoint="wbcore:workflow:joinstep-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["workflow.add_joinstep"]
+            method=lambda request: request.user.is_internal, permissions=["workflow.add_joinstep"]
         ),
     ),
 )
@@ -82,13 +77,13 @@ SCRIPTSTEP_MENUITEM = MenuItem(
     label=_("Script Step"),
     endpoint="wbcore:workflow:scriptstep-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_scriptstep"]
+        method=lambda request: request.user.is_internal, permissions=["workflow.view_scriptstep"]
     ),
     add=MenuItem(
         label=_("Create Script Step"),
         endpoint="wbcore:workflow:scriptstep-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["workflow.add_scriptstep"]
+            method=lambda request: request.user.is_internal, permissions=["workflow.add_scriptstep"]
         ),
     ),
 )
@@ -97,13 +92,13 @@ EMAILSTEP_MENUITEM = MenuItem(
     label=_("Email Step"),
     endpoint="wbcore:workflow:emailstep-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_emailstep"]
+        method=lambda request: request.user.is_internal, permissions=["workflow.view_emailstep"]
     ),
     add=MenuItem(
         label=_("Create Email Step"),
         endpoint="wbcore:workflow:emailstep-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["workflow.add_emailstep"]
+            method=lambda request: request.user.is_internal, permissions=["workflow.add_emailstep"]
         ),
     ),
 )
@@ -112,13 +107,13 @@ FINISHSTEP_MENUITEM = MenuItem(
     label=_("Finish Step"),
     endpoint="wbcore:workflow:finishstep-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_finishstep"]
+        method=lambda request: request.user.is_internal, permissions=["workflow.view_finishstep"]
     ),
     add=MenuItem(
         label=_("Create Finish Step"),
         endpoint="wbcore:workflow:finishstep-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["workflow.add_finishstep"]
+            method=lambda request: request.user.is_internal, permissions=["workflow.add_finishstep"]
         ),
     ),
 )

wbcore/contrib/workflow/viewsets/menu/transition.py

@@ -1,19 +1,18 @@
 from django.utils.translation import gettext as _
 
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 TRANSITION_MENUITEM = MenuItem(
     label=_("Transition"),
     endpoint="wbcore:workflow:transition-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_transition"]
+        method=lambda request: request.user.is_internal, permissions=["workflow.view_transition"]
     ),
     add=MenuItem(
         label=_("Create Transition"),
         endpoint="wbcore:workflow:transition-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["workflow.add_transition"]
+            method=lambda request: request.user.is_internal, permissions=["workflow.add_transition"]
         ),
     ),
 )

wbcore/contrib/workflow/viewsets/menu/workflow.py

@@ -1,19 +1,16 @@
 from django.utils.translation import gettext as _
 
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 WORKFLOW_MENUITEM = MenuItem(
     label=_("Workflow"),
     endpoint="wbcore:workflow:workflow-list",
-    permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_workflow"]
-    ),
+    permission=ItemPermission(method=lambda request: request.user.is_internal, permissions=["workflow.view_workflow"]),
     add=MenuItem(
         label=_("Create Workflow"),
         endpoint="wbcore:workflow:workflow-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["workflow.add_workflow"]
+            method=lambda request: request.user.is_internal, permissions=["workflow.add_workflow"]
         ),
     ),
 )

wbcore/tests/models.py

@@ -1,4 +1,4 @@
-from wbcore.contrib.guardian.models.mixins import PermissionObjectModelMixin
+from wbcore.contrib.permission.models.mixins import PermissionObjectModelMixin
 
 
 class PermissionTestModel(PermissionObjectModelMixin):

wbcore/urls.py

@@ -105,8 +105,8 @@ urlpatterns = [
         include(("wbcore.contrib.workflow.urls", "wbcore.contrib.workflow"), namespace="workflow"),
     ),
     path(
-        "guardian/",
-        include(("wbcore.contrib.guardian.urls", "wbcore.contrib.guardian"), namespace="guardian"),
+        "permission/",
+        include(("wbcore.contrib.permission.urls", "wbcore.contrib.permission"), namespace="permission"),
     ),
     path("clear_cache/<str:cache_key>/", clear_cache, name="clear_cache"),
 ]

{wbcore-1.61.3.dist-info → wbcore-1.61.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcore
-Version: 1.61.3
+Version: 1.61.5
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: celery[redis]==5.*
 Requires-Dist: croniter==2.*