1
0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2025-02-22 17:41:25 +00:00

Compare commits

...

16 Commits

Author SHA1 Message Date
6c064d6570
Fix permissions on team authorizations 2021-02-13 17:09:17 +01:00
140048bcdb Fix typo: intersting -> interesting 2021-02-13 16:01:02 +00:00
Yohann D'ANELLO
73cadd8cfd Merge branch 'dev' into 'master'
Dev

See merge request animath/si/plateforme-tfjm!19
2021-02-07 16:45:54 +00:00
Yohann D'ANELLO
12acb0ca26 Merge branch 'dev' into 'master'
Volunteers can add organizers

See merge request animath/si/plateforme-tfjm!18
2021-02-06 18:31:20 +00:00
Yohann D'ANELLO
a846750911 Merge branch 'dev' into 'master'
Coaches can update their photo authorization

See merge request animath/si/plateforme-tfjm!17
2021-01-30 15:28:03 +00:00
Yohann D'ANELLO
a8a69c766c Merge branch 'dev' into 'master'
Raise error when a given tournament does not exist

See merge request animath/si/plateforme-tfjm!16
2021-01-29 19:24:43 +00:00
Yohann D'ANELLO
9c4e68d0ea Merge branch 'dev' into 'master'
Permissions on user detail

See merge request animath/si/plateforme-tfjm!15
2021-01-29 09:36:53 +00:00
Yohann D'ANELLO
e2d5a55173 Merge branch 'dev' into 'master'
Dev

See merge request animath/si/plateforme-tfjm!14
2021-01-24 22:57:37 +00:00
Yohann D'ANELLO
1b117e9289 Merge branch 'dev' into 'master'
Local organizers validate teams

See merge request animath/si/plateforme-tfjm!13
2021-01-23 20:59:40 +00:00
Yohann D'ANELLO
629c4d2367 Merge branch 'dev' into 'master'
Remote tournaments + Animath logo

See merge request animath/si/plateforme-tfjm!12
2021-01-23 19:27:56 +00:00
Yohann D'ANELLO
f83b4c094e Merge branch 'dev' into 'master'
Dev

See merge request animath/si/plateforme-tfjm!11
2021-01-23 13:33:54 +00:00
Yohann D'ANELLO
8162a48754 Merge branch 'dev' into 'master'
Fix the permission to see a user page

See merge request animath/si/plateforme-tfjm!10
2021-01-23 10:06:14 +00:00
Yohann D'ANELLO
68a5467a35 Merge branch 'dev' into 'master'
Unleash the beast

See merge request animath/si/plateforme-tfjm!9
2021-01-22 22:28:19 +00:00
Yohann D'ANELLO
4c476a50ea Merge branch 'dev' into 'master'
Use a custom BBB url link, that is not necessary on visio.animath.live

See merge request animath/si/plateforme-tfjm!8
2021-01-22 17:32:34 +00:00
Yohann D'ANELLO
641e53e617 Merge branch 'dev' into 'master'
Dev

See merge request animath/si/plateforme-tfjm!7
2021-01-22 08:51:59 +00:00
Yohann D'ANELLO
75db278a97 Merge branch 'dev' into 'master'
Fix latex and admins

See merge request animath/si/plateforme-tfjm!6
2021-01-21 21:58:00 +00:00
2 changed files with 2 additions and 2 deletions

View File

@ -375,7 +375,7 @@ class TeamAuthorizationsView(LoginRequiredMixin, DetailView):
return super().handle_no_permission()
if user.registration.is_admin or user.registration.participates and user.registration.team.pk == kwargs["pk"] \
or user.registration.is_volunteer \
and self.object.participation.tournament in user.registration.interesting_tournaments:
and self.get_object().participation.tournament in user.registration.interesting_tournaments:
return super().dispatch(request, *args, **kwargs)
raise PermissionDenied

View File

@ -244,7 +244,7 @@ class UserDetailView(LoginRequiredMixin, DetailView):
and user.registration.participates and user.registration.team \
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):
and me.registration.interesting_tournaments.intersection(user.registration.interesting_tournaments):
return super().dispatch(request, *args, **kwargs)
raise PermissionDenied