Corrige l'enregistrement des dispos pour les chargés de projets hors …

…de leurs cantons
defivelo · Aug 30, 2017 · 118271c · 118271c
1 parent 1fada76
commit 118271c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/apps/challenge/models/season.py b/apps/challenge/models/season.py
@@ -106,7 +106,6 @@ def sessions_with_qualifs(self):
                 ).filter(qualifications__count__gt=0, )
         return self.sessions_with_q
 
-
     def get_absolute_url(self):
         return reverse('season-detail', args=[self.pk])
 

diff --git a/apps/challenge/views/season.py b/apps/challenge/views/season.py
@@ -514,7 +514,17 @@ def get_context_data(self, **kwargs):
         return context
 
     def get_success_url(self):
-        if has_permission(self.request.user, 'challenge_season_crud'):
+        try:
+            usercantons = user_cantons(self.request.user)
+        except PermissionDenied:
+            usercantons = None
+        if (
+            has_permission(self.request.user, 'challenge_season_crud') and
+            list(
+                set(usercantons)
+                .intersection(set(self.season.cantons))
+            )
+        ):
             return reverse_lazy('season-availabilities',
                                 kwargs={'pk': self.season.pk})
         else:

diff --git a/apps/user/views/mixins.py b/apps/user/views/mixins.py
@@ -30,7 +30,9 @@
 from defivelo.views import MenuView
 
 from ..forms import UserProfileForm
-from ..models import DV_PRIVATE_FIELDS, DV_PUBLIC_FIELDS, PERSONAL_FIELDS, STD_PROFILE_FIELDS, UserProfile
+from ..models import (
+    DV_PRIVATE_FIELDS, DV_PUBLIC_FIELDS, MULTISELECTFIELD_REGEXP, PERSONAL_FIELDS, STD_PROFILE_FIELDS, UserProfile,
+)
 
 
 class ProfileMixin(MenuView):