wbcore 1.61.2__tar.gz → 1.61.4__tar.gz

{wbcore-1.61.2 → wbcore-1.61.4}/PKG-INFO

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

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/configurations/base.py

@@ -6,9 +6,9 @@ from wbcore.contrib.authentication.configurations import (
     AuthenticationConfigurationMixin,
 )
 from wbcore.contrib.directory.configurations import DirectoryConfigurationMixin
-from wbcore.contrib.guardian.configurations import Guardian
 from wbcore.contrib.io.configurations import ImportExportBaseConfiguration
 from wbcore.contrib.notifications.configurations import NotificationConfiguration
+from wbcore.contrib.permission.configurations import PermissionConfiguration
 
 
 class DevBaseConfiguration(
@@ -27,7 +27,7 @@ class DevBaseConfiguration(
     configurations.Authentication,
     configurations.DevMiddleware,
     configurations.LocalStaticfiles,
-    Guardian,
+    PermissionConfiguration,
     configurations.WBCore,
     configurations.Celery,
     configurations.I18NL10N,

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/configurations/configurations/apps.py

@@ -30,7 +30,7 @@ class Apps:
         "wbcore.contrib.documents",
         "wbcore.contrib.workflow",
         "wbcore.contrib.color",
-        "wbcore.contrib.guardian",
+        "wbcore.contrib.permission",
         "django_celery_beat",
         "modeltrans",
         "maintenance_mode",

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/configurations/configurations/rest_framework.py

@@ -17,7 +17,7 @@ class Restframework:
             ),
             "DEFAULT_PERMISSION_CLASSES": (
                 "rest_framework.permissions.IsAuthenticated",
-                "wbcore.permissions.permissions.RestAPIModelPermissions",
+                "wbcore.contrib.permission.permissions.RestAPIModelPermissions",
             ),
             "DATETIME_FORMAT": "%Y-%m-%dT%H:%M:%S%z",
             "DEFAULT_THROTTLE_CLASSES": [

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/agenda/viewsets/menu/calendar_items.py

@@ -1,12 +1,11 @@
 from django.utils.translation import gettext as _
 
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 CALENDAR_MENUITEM = MenuItem(
     label=_("Calendar"),
     endpoint="wbcore:agenda:calendaritem-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["agenda.view_calendaritem"]
+        method=lambda request: request.user.is_internal, permissions=["agenda.view_calendaritem"]
     ),
 )

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/agenda/viewsets/menu/conference_room.py

@@ -1,20 +1,19 @@
 from django.utils.translation import gettext as _
 
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 BUILDING_MENUITEM = MenuItem(
     label=_("Buildings"),
     endpoint="wbcore:agenda:building-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user),
+        method=lambda request: request.user.is_internal,
         permissions=["agenda.view_building"],
     ),
     add=MenuItem(
         label=_("Create Building"),
         endpoint="wbcore:agenda:building-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user),
+            method=lambda request: request.user.is_internal,
             permissions=["agenda.add_building"],
         ),
     ),
@@ -24,14 +23,14 @@ CONFERENCE_ROOM_MENUITEM = MenuItem(
     label=_("Conference Rooms"),
     endpoint="wbcore:agenda:conferenceroom-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user),
+        method=lambda request: request.user.is_internal,
         permissions=["agenda.view_conferenceroom"],
     ),
     add=MenuItem(
         label=_("Create Conference Room"),
         endpoint="wbcore:agenda:conferenceroom-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user),
+            method=lambda request: request.user.is_internal,
             permissions=["agenda.add_conferenceroom"],
         ),
     ),

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/authentication/admin.py

@@ -23,6 +23,8 @@ from django.utils.translation import gettext_lazy as _
 from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.debug import sensitive_post_parameters
 
+from wbcore.contrib.permission.internal.registry import UserBackendRegistry
+
 from .models import Token, User, UserActivity
 
 csrf_protect_m = method_decorator(csrf_protect)
@@ -93,8 +95,8 @@ class UserAdmin(admin.ModelAdmin):
     add_form = UserCreationForm
     change_password_form = AdminPasswordChangeForm
 
-    list_display = ("email", "username", "uuid", "is_staff", "is_active", "is_register")
-    list_filter = ("is_staff", "is_superuser", "is_active", "groups")
+    list_display = ("email", "username", "uuid", "is_staff", "is_active", "is_register", "is_internal")
+    list_filter = ("is_staff", "is_superuser", "is_active", "is_internal", "groups")
     search_fields = ("email", "username")
     ordering = ("email",)
     filter_horizontal = (
@@ -245,3 +247,14 @@ class UserAdmin(admin.ModelAdmin):
             request.POST = request.POST.copy()
             request.POST["_continue"] = 1
         return super(UserAdmin, self).response_add(request, obj, post_url_continue)
+
+    actions = ["reset_internal_user_cache"]
+
+    @admin.action(description=_("Reset Internal User Cache (select any user to activate)"))
+    def reset_internal_user_cache(self, request, queryset):
+        """
+        Generic action that does not depend on selected objects.
+        """
+
+        UserBackendRegistry().refresh_users(reset_all=True)
+        messages.success(request, _("User reset succesfully"))

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/authentication/factories/users.py

@@ -5,7 +5,7 @@ from dynamic_preferences.registries import global_preferences_registry
 
 from wbcore.contrib.directory.factories import CompanyFactory, PersonFactory
 from wbcore.contrib.directory.models import Company
-from wbcore.permissions.registry import user_registry
+from wbcore.contrib.permission.internal.registry import UserBackendRegistry
 
 from ..models import Group, User
 
@@ -45,6 +45,8 @@ class UserFactory(factory.django.DjangoModelFactory):
 
 
 class InternalUserFactory(UserFactory):
+    is_internal = True
+
     @factory.post_generation
     def add_internal_profile(self, create, extracted, **kwargs):
         main_company_id = global_preferences_registry.manager()["directory__main_company"]
@@ -59,7 +61,7 @@ class InternalUserFactory(UserFactory):
         self.user_permissions.add(
             Permission.objects.get(content_type__app_label="authentication", codename="is_internal_user")
         )
-        user_registry.reset_cache()
+        UserBackendRegistry().refresh_users()
 
 
 class SuperUserFactory(UserFactory):

wbcore-1.61.4/wbcore/contrib/authentication/migrations/0008_user_is_internal.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.9 on 2026-01-26 12:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0007_alter_token_unique_together_token_unique_token'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='is_internal',
+            field=models.BooleanField(default=False, help_text='If true, define this user as internal which grants specific permissions.', verbose_name='Internal'),
+        ),
+    ]

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/authentication/models/users.py

@@ -18,9 +18,20 @@ from wbcore.signals import pre_merge
 from wbcore.utils.models import MergeError
 
 
+class UserQuerySet(models.QuerySet):
+    def filter_internal(self):
+        return self.filter(is_internal=True)
+
+
 class UserManager(BaseUserManager):
     use_in_migrations = True
 
+    def get_queryset(self) -> UserQuerySet:
+        return UserQuerySet(self.model, using=self._db)
+
+    def filter_internal(self):
+        return self.get_queryset().filter_internal()
+
     @classmethod
     def normalize_username(cls, username):
         return unicodedata.normalize("NFKC", force_str(username))
@@ -77,6 +88,11 @@ class User(AbstractBaseUser, PermissionsMixin):
     is_register = models.BooleanField(
         _("register"), default=True, help_text=_("Specifies whether this user has registered its email. ")
     )
+    is_internal = models.BooleanField(
+        _("Internal"),
+        default=False,
+        help_text="If true, define this user as internal which grants specific permissions.",
+    )
     date_joined = models.DateTimeField(_("date joined"), default=timezone.now)
     metadata = models.JSONField(default=dict, blank=True)
 
@@ -91,12 +107,6 @@ class User(AbstractBaseUser, PermissionsMixin):
         swappable = "AUTH_USER_MODEL"
         permissions = [("administrate_user", "Administrate Users"), ("is_internal_user", "Internal User")]
 
-    @property
-    def is_internal(self):
-        from wbcore.permissions.registry import user_registry
-
-        return self in user_registry.internal_users
-
     def get_full_name(self):
         full_name = "%s %s" % (self.profile.first_name, self.profile.last_name)
         return full_name.strip()

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/authentication/serializers/users.py

@@ -271,7 +271,7 @@ class UserProfileModelSerializer(wb_serializers.ModelSerializer):
             resources["reset_settings"] = reverse(
                 "wbcore:authentication:userprofile-reset-settings", args=[instance.id], request=request
             )
-            if user.profile.is_internal:
+            if user.is_internal:
                 resources["see_profile"] = reverse(
                     "wbcore:directory:person-detail", args=[instance.profile.id], request=request
                 )

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/authentication/viewsets/menu/user_activities.py

@@ -6,35 +6,38 @@ USER_ACTIVITY_MENUITEM = MenuItem(
     label=_("User Activity"),
     endpoint="wbcore:authentication:useractivity-list",
     permission=ItemPermission(
+        method=lambda request: request.user.is_internal,
         permissions=[
             "authentication.view_user",
             "authentication.add_user",
             "authentication.delete_user",
             "authentication.change_user",
-        ]
+        ],
     ),
 )
 USER_ACTIVITY_TABLE_MENUITEM = MenuItem(
     label=_("User Activity Table"),
     endpoint="wbcore:authentication:useractivitytable-list",
     permission=ItemPermission(
+        method=lambda request: request.user.is_internal,
         permissions=[
             "authentication.view_user",
             "authentication.add_user",
             "authentication.delete_user",
             "authentication.change_user",
-        ]
+        ],
     ),
 )
 USER_ACTIVITY_CHART_MENUITEM = MenuItem(
     label=_("User Activity Chart"),
     endpoint="wbcore:authentication:useractivitychart-list",
     permission=ItemPermission(
+        method=lambda request: request.user.is_internal,
         permissions=[
             "authentication.view_user",
             "authentication.add_user",
             "authentication.delete_user",
             "authentication.change_user",
-        ]
+        ],
     ),
 )

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/authentication/viewsets/menu/users.py

@@ -1,13 +1,12 @@
 from django.utils.translation import gettext as _
 
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 USER_MENUITEM = MenuItem(
     label=_("Users"),
     endpoint="wbcore:authentication:user-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["authentication.view_user"]
+        method=lambda request: request.user.is_internal, permissions=["authentication.view_user"]
     ),
     add=MenuItem(
         label=_("Create New User"),

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/authentication/viewsets/users.py

@@ -200,7 +200,7 @@ class UserRepresentationViewSet(viewsets.RepresentationViewSet):
     serializer_class = UserRepresentationSerializer
 
     def get_queryset(self):
-        if self.request.user.is_superuser or self.request.user.profile.is_internal:
+        if self.request.user.is_internal:
             return User.objects.all()
         return User.objects.filter(id=self.request.user.id)
 
@@ -302,7 +302,7 @@ class UserModelViewSet(viewsets.ModelViewSet):
     def get_queryset(self):
         if self.request.user.has_perm("authentication.administrate_user"):
             qs = User.objects.all()
-        elif self.request.user.profile.is_internal:
+        elif self.request.user.is_internal:
             qs = User.objects.filter(profile__relationship_managers=self.request.user.profile)
         else:
             qs = User.objects.filter(id=self.request.user.id)

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/currency/tests/test_serializers.py

@@ -1,3 +1,5 @@
+from decimal import Decimal
+
 import pytest
 from django.utils import timezone
 from pytest_mock import MockerFixture
@@ -42,7 +44,7 @@ class TestSerializers:
     def expected_data_fx_rate(self, currency_fx_rate):
         return {
             "id": currency_fx_rate.id,
-            "value": currency_fx_rate.value,
+            "value": Decimal(currency_fx_rate.value),
             "date": currency_fx_rate.date,
             "currency": currency_fx_rate.currency_id,
         }

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/directory/admin/entries.py

@@ -232,4 +232,4 @@ class PersonAdmin(EntryAdmin):
         if telephone and telephone.get("number", None):
             TelephoneContact.objects.get_or_create(entry=obj, number=telephone["number"], defaults=telephone)
         if email and email.get("address", None):
-            EmailContact.objects.get_or_create(entry=obj, address=email["address"], defaults=email)
+            EmailContact.objects.get_or_create(address=email["address"], defaults={"entry": obj})

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/directory/models/entries.py

@@ -40,7 +40,6 @@ from wbcore.contrib.directory.models.relationships import (
 from wbcore.contrib.directory.signals import deactivate_profile
 from wbcore.contrib.directory.typings import Person as PersonDTO
 from wbcore.models import WBModel
-from wbcore.permissions.shortcuts import get_internal_users
 from wbcore.utils.models import (
     ActiveObjectManager,
     ComplexToStringMixin,
@@ -233,7 +232,7 @@ class EntryDefaultQueryset(models.QuerySet):
             )
 
     def filter_only_internal(self) -> models.QuerySet:
-        return self.filter(id__in=get_internal_users().values("profile"))
+        return self.filter(id__in=User.objects.filter_internal().values("profile"))
 
     def annotate_all(self) -> models.QuerySet:
         qs = self
@@ -620,7 +619,7 @@ class Person(Entry):
         verbose_name = _("Person")
         verbose_name_plural = _("Persons")
 
-    @cached_property
+    @property
     def is_internal(self) -> bool:
         if user := getattr(self, "user_account", None):
             return user.is_internal
@@ -720,28 +719,18 @@ class Person(Entry):
         if profile := getattr(user, "profile", None):
             return profile
         else:
-            associated_emails = EmailContact.objects.filter(
-                address=user.email, entry__isnull=False, entry__entry_type="Person", entry__is_active=True
-            )
-            if (
-                associated_emails.exists()
-                and (person := Person.objects.get(id=associated_emails.first().entry.id))
-                and getattr(person, "user_account", None) is None
-            ):
-                return person
-            else:
-                usernames = user.username.split("-")
-                if not first_name:
-                    first_name = usernames[0]
-                if not last_name and len(usernames) > 1:
-                    last_name = usernames[1]
-                person = cls.objects.create(first_name=first_name, last_name=last_name)
-                EmailContact.objects.create(
-                    primary=True,
-                    location=ContactLocationChoices.WORK.name,
-                    entry=person,
-                    address=user.email,
-                )
+            contact = EmailContact.objects.get_or_create(address=user.email)[0]
+            if contact.entry:
+                with suppress(Person.DoesNotExist):
+                    return Person.objects.get(id=contact.entry.id)
+            usernames = user.username.split("-")
+            if not first_name:
+                first_name = usernames[0]
+            if not last_name and len(usernames) > 1:
+                last_name = usernames[1]
+            person = cls.objects.create(first_name=first_name.title(), last_name=last_name.title())
+            contact.entry_id = person.id
+            contact.save()
             return person
 
     @classmethod
@@ -753,13 +742,15 @@ class Person(Entry):
             user {User} -- The user used to generate the profile
         """
 
-        person = cls.objects.create(first_name=first_name, last_name=last_name)
+        person = cls.objects.create(first_name=first_name.title(), last_name=last_name.title())
         if email:
-            EmailContact.objects.create(
-                primary=True,
-                location=ContactLocationChoices.WORK.name,
-                entry=person,
+            EmailContact.objects.get_or_create(
                 address=email,
+                defaults={
+                    "primary": True,
+                    "location": ContactLocationChoices.WORK.name,
+                    "entry": person,
+                },
             )
 
         return person

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/directory/tests/test_permissions.py

@@ -57,10 +57,8 @@ class TestEntryPermissionQueryset:
         Test that internal user can see everything
         """
         user, anonymous_profile, any_person, any_company, employer, colleague, client = entry_fixtures
-        user.user_permissions.add(
-            Permission.objects.get(content_type__app_label="authentication", codename="is_internal_user")
-        )
-        user = User.objects.get(id=user.id)
+        user.is_internal = True
+        user.save()
 
         assert set(Entry.objects.filter_for_user(user)) == {
             user.profile.entry_ptr,

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/directory/viewsets/endpoints/relationships.py

@@ -2,7 +2,6 @@ from rest_framework.reverse import reverse
 
 from wbcore.contrib.directory.models import ClientManagerRelationship
 from wbcore.metadata.configs.endpoints import EndpointViewConfig
-from wbcore.permissions.shortcuts import is_internal_user
 
 
 class RelationshipEntryModelEndpoint(EndpointViewConfig):
@@ -76,6 +75,6 @@ class UserIsClientEndpointConfig(EndpointViewConfig):
         return None
 
     def get_instance_endpoint(self, **kwargs):
-        if is_internal_user(self.request.user, include_superuser=True):
+        if self.request.user.is_internal:
             return reverse("wbcore:directory:person-list", request=self.request)
         return None

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/directory/viewsets/entries.py

@@ -122,7 +122,7 @@ class EntryModelViewSet(MergeMixin, EntryPermissionMixin, TransparencyMixin, vie
 
     @cached_property
     def is_internal_user(self):
-        return self.request.user.profile and self.request.user.profile.is_internal
+        return self.request.user.is_internal
 
 
 class PersonModelViewSet(ModelTranslateMixin, EntryModelViewSet):

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/directory/viewsets/menu/contacts.py

@@ -2,14 +2,13 @@ from django.utils.translation import gettext as _
 
 from wbcore.contrib.directory.models import BankingContact
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 PENDING_BANKINGCONTACT_MENUITEM = MenuItem(
     label=_("Pending Banking Contacts"),
     endpoint="wbcore:directory:bankingcontact-list",
     endpoint_get_parameters={"status": BankingContact.Status.PENDING.value},
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user),
+        method=lambda request: request.user.is_internal,
         permissions=[
             "directory.view_bankingcontact",
             "directory.administrate_banking_contact",
@@ -21,6 +20,6 @@ TELEPHONECONTACTSEARCH_MENUITEM = MenuItem(
     label=_("Search by Telephone Contact"),
     endpoint="wbcore:directory:telephonecontact-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["directory.view_telephonecontact"]
+        method=lambda request: request.user.is_internal, permissions=["directory.view_telephonecontact"]
     ),
 )

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/directory/viewsets/menu/entries.py

@@ -1,12 +1,11 @@
 from django.utils.translation import gettext as _
 
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 YOUR_CONTACT_MENUITEM = MenuItem(
     label=_("Your Contact"),
     endpoint="wbcore:directory:clientmanagerrelationship-userclient-list",
-    permission=ItemPermission(method=lambda request: request.user.is_active and not request.user.profile.is_internal),
+    permission=ItemPermission(method=lambda request: request.user.is_active and not request.user.is_internal),
 )
 
 COMPANY_MENUITEM = MenuItem(
@@ -33,30 +32,22 @@ PERSON_MENUITEM = MenuItem(
 SYSTEMEMPLOYEE_MENUITEM = MenuItem(
     label=_("Employees"),
     endpoint="wbcore:directory:systememployee-list",
-    permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["directory.view_person"]
-    ),
+    permission=ItemPermission(method=lambda request: request.user.is_internal, permissions=["directory.view_person"]),
 )
 
 BANK_MENUITEM = MenuItem(
     label=_("Banks"),
     endpoint="wbcore:directory:bank-list",
-    permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["directory.view_bank"]
-    ),
+    permission=ItemPermission(method=lambda request: request.user.is_internal, permissions=["directory.view_bank"]),
     add=MenuItem(
         label=_("Create Bank"),
         endpoint="wbcore:directory:bank-list",
-        permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["directory.add_bank"]
-        ),
+        permission=ItemPermission(method=lambda request: request.user.is_internal, permissions=["directory.add_bank"]),
     ),
 )
 
 USERISMANAGER_MENUITEM = MenuItem(
     label=_("Your Clients/Prospects/Contacts"),
     endpoint="wbcore:directory:clientmanagerrelationship-usermanager-list",
-    permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["directory.view_person"]
-    ),
+    permission=ItemPermission(method=lambda request: request.user.is_internal, permissions=["directory.view_person"]),
 )

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/directory/viewsets/menu/relationships.py

@@ -1,20 +1,19 @@
 from django.utils.translation import gettext as _
 
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 RELATIONSHIPTYPE_MENUITEM = MenuItem(
     label=_("Relationship Types"),
     endpoint="wbcore:directory:relationship-type-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user),
+        method=lambda request: request.user.is_internal,
         permissions=["directory.view_relationshiptype"],
     ),
     add=MenuItem(
         label=_("Create Relationship Type"),
         endpoint="wbcore:directory:relationship-type-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user),
+            method=lambda request: request.user.is_internal,
             permissions=["directory.add_relationshiptype"],
         ),
     ),

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/directory/viewsets/menu/utils.py

@@ -1,20 +1,19 @@
 from django.utils.translation import gettext as _
 
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 POSITION_MENUITEM = MenuItem(
     label=_("Company Positions"),
     endpoint="wbcore:directory:position-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user),
+        method=lambda request: request.user.is_internal,
         permissions=["directory.view_position"],
     ),
     add=MenuItem(
         label=_("Create Position"),
         endpoint="wbcore:directory:position-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user),
+            method=lambda request: request.user.is_internal,
             permissions=["directory.add_position"],
         ),
     ),
@@ -24,14 +23,14 @@ CUSTOMERSTATUS_MENUITEM = MenuItem(
     label=_("Customer Statuses"),
     endpoint="wbcore:directory:customerstatus-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user),
+        method=lambda request: request.user.is_internal,
         permissions=["directory.view_customerstatus"],
     ),
     add=MenuItem(
         label=_("Create Customer Status"),
         endpoint="wbcore:directory:customerstatus-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user),
+            method=lambda request: request.user.is_internal,
             permissions=["directory.add_customerstatus"],
         ),
     ),
@@ -41,14 +40,14 @@ COMPANYTYPE_MENUITEM = MenuItem(
     label=_("Company Types"),
     endpoint="wbcore:directory:companytype-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user),
+        method=lambda request: request.user.is_internal,
         permissions=["directory.view_companytype"],
     ),
     add=MenuItem(
         label=_("Create Company Type"),
         endpoint="wbcore:directory:companytype-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user),
+            method=lambda request: request.user.is_internal,
             permissions=["directory.add_companytype"],
         ),
     ),
@@ -59,14 +58,14 @@ SPECIALIZATION_MENUITEM = MenuItem(
     label=_("Specializations"),
     endpoint="wbcore:directory:specialization-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user),
+        method=lambda request: request.user.is_internal,
         permissions=["directory.view_specialization"],
     ),
     add=MenuItem(
         label=_("Create Specialization"),
         endpoint="wbcore:directory:specialization-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user),
+            method=lambda request: request.user.is_internal,
             permissions=["directory.add_specialization"],
         ),
     ),

{wbcore-1.61.2 → wbcore-1.61.4}/wbcore/contrib/documents/models/documents.py

@@ -22,7 +22,7 @@ from django.utils.translation import gettext_lazy as _
 from slugify import slugify
 
 from wbcore.contrib.authentication.models import User
-from wbcore.contrib.guardian.models.mixins import PermissionObjectModelMixin
+from wbcore.contrib.permission.models.mixins import PermissionObjectModelMixin
 from wbcore.models import WBModel
 from wbcore.utils.html import convert_html2text
 from wbcore.workers import Queue