mirror of
https://gitlab.com/animath/si/plateforme.git
synced 2024-12-25 06:22:22 +00:00
Merge branch 'dev' into 'master'
Permissions on user detail See merge request animath/si/plateforme-tfjm!15
This commit is contained in:
commit
9c4e68d0ea
@ -242,7 +242,7 @@ class UserDetailView(LoginRequiredMixin, DetailView):
|
||||
user = self.get_object()
|
||||
if user == me or me.registration.is_admin or me.registration.is_volunteer \
|
||||
and user.registration.participates and user.registration.team \
|
||||
and user.registration.team.participation.tournament in user.registration.organized_tournaments.all() \
|
||||
and user.registration.team.participation.tournament in me.registration.organized_tournaments.all() \
|
||||
or user.registration.is_volunteer and me.registration.is_volunteer \
|
||||
and me.registration.interesting_tournaments.intersection(user.registration.intersting_tournaments):
|
||||
return super().dispatch(request, *args, **kwargs)
|
||||
@ -376,10 +376,12 @@ class AuthorizationTemplateView(TemplateView):
|
||||
if registration.user == self.request.user \
|
||||
or self.request.user.is_authenticated and self.request.user.registration.is_admin:
|
||||
context["registration"] = registration
|
||||
if "tournament_id" in self.request.GET:
|
||||
if "tournament_id" in self.request.GET and self.request.GET.get("tournament_id").isnumeric():
|
||||
if not Tournament.objects.filter(pk=self.request.get("tournament_id")).exists():
|
||||
raise PermissionDenied("Ce tournoi n'existe pas.")
|
||||
context["tournament"] = Tournament.objects.get(pk=self.request.GET.get("tournament_id"))
|
||||
else:
|
||||
raise ValueError("Merci d'indiquer un tournoi.")
|
||||
raise PermissionDenied("Merci d'indiquer un tournoi.")
|
||||
|
||||
return context
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user