Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions apps/accounts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ def set_role_groups_members(self):


class ProjectUser(
HasRelatedModules,
HasAutoTranslatedFields,
HasMultipleIDs,
HasOwner,
Expand Down Expand Up @@ -388,6 +389,8 @@ def __init__(self, *args, **kwargs):
landline_phone = models.CharField(blank=True, max_length=255)
twitter = models.URLField(blank=True)

objects = MultipleIdsQuerySet.as_manager()

def __str__(self):
return self.get_full_name()

Expand Down Expand Up @@ -439,9 +442,12 @@ def get_main_id(
) -> Any:
try:
return super().get_main_id(object_id, returned_field)
except Http404:
user = cls.import_from_keycloak(object_id)
return getattr(user, returned_field)
except Http404 as e:
try:
user = cls.import_from_keycloak(object_id)
return getattr(user, returned_field)
except (KeycloakGetError, RemoteKeycloakAccountNotFound):
raise Http404 from e

@classmethod
@transaction.atomic
Expand Down Expand Up @@ -494,11 +500,15 @@ def get_owner(self) -> "ProjectUser":
def get_related_organizations(self) -> list["Organization"]:
"""Return the organizations related to this model."""
if self._related_organizations is None:
self._related_organizations = list(
Organization.objects.filter(groups__users=self).distinct()
)
self._related_organizations = list(self.get_organizations_queryset())
return self._related_organizations

def get_organizations_queryset(self) -> QuerySet["Organization"]:
qs = Organization.objects.filter(groups__users=self).distinct()
if self.is_superuser:
return Organization.objects.all()
return qs

def get_full_name(self) -> str:
"""Return the first_name plus the last_name, with a space in between."""
return f"{self.given_name.capitalize()} {self.family_name.capitalize()}".strip()
Expand Down
6 changes: 6 additions & 0 deletions apps/accounts/permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ def has_permission(self, request: Request, view: GenericViewSet) -> bool:
return request.user.get_project_queryset().contains(view.project)


class UserNestedPermission(permissions.BasePermission):
def has_permission(self, request: Request, view: GenericViewSet) -> bool:
"""check "user" from NestedUserMixins"""
return request.user.get_user_queryset().contains(view.user)


def HasBasePermission( # noqa: N802
codename: str, app: str = ""
) -> permissions.BasePermission:
Expand Down
Loading
Loading