Merge pull request #1037 from ae-utbm/unix-name

Refactor Club
This commit is contained in:
thomas girod
2025-04-04 09:27:33 +02:00
committed by GitHub
25 changed files with 499 additions and 506 deletions

View File

@ -243,17 +243,7 @@ class UserTabsMixin(TabedViewMixin):
if (
hasattr(user, "customer")
and user.customer
and (
user == self.request.user
or self.request.user.is_in_group(
pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID
)
or self.request.user.is_in_group(
name=settings.SITH_BAR_MANAGER["unix_name"]
+ settings.SITH_BOARD_SUFFIX
)
or self.request.user.is_root
)
and (user == self.request.user or user.has_perm("counter.view_customer"))
):
tab_list.append(
{
@ -362,12 +352,7 @@ class UserStatsView(UserTabsMixin, CanViewMixin, DetailView):
raise Http404
if not (
profile == request.user
or request.user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
or request.user.is_in_group(
name=settings.SITH_BAR_MANAGER["unix_name"] + settings.SITH_BOARD_SUFFIX
)
or request.user.is_root
profile == request.user or request.user.has_perm("counter.view_customer")
):
raise PermissionDenied
@ -591,14 +576,9 @@ class UserAccountBase(UserTabsMixin, DetailView):
current_tab = "account"
queryset = User.objects.select_related("customer")
def dispatch(self, request, *arg, **kwargs): # Manually validates the rights
if (
kwargs.get("user_id") == request.user.id
or request.user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
or request.user.is_in_group(
name=settings.SITH_BAR_MANAGER["unix_name"] + settings.SITH_BOARD_SUFFIX
)
or request.user.is_root
def dispatch(self, request, *arg, **kwargs):
if kwargs.get("user_id") == request.user.id or request.user.has_perm(
"counter.view_customer"
):
return super().dispatch(request, *arg, **kwargs)
raise PermissionDenied