Merge branch 'master' into aureplop/clean_scroll

kfet/forms.py

@@ -134,6 +134,7 @@ class UserRestrictTeamForm(UserForm):
     class Meta(UserForm.Meta):
         fields = ['first_name', 'last_name', 'email']
 
+
 class UserGroupForm(forms.ModelForm):
     groups = forms.ModelMultipleChoiceField(
             Group.objects.filter(name__icontains='K-Fêt'),
@@ -141,14 +142,12 @@ class UserGroupForm(forms.ModelForm):
             required=False)
 
     def clean_groups(self):
-        groups = self.cleaned_data.get('groups')
-        # Si aucun groupe, on le dénomme
-        if not groups:
-            groups = self.instance.groups.exclude(name__icontains='K-Fêt')
-        return groups
+        kfet_groups = self.cleaned_data.get('groups')
+        other_groups = self.instance.groups.exclude(name__icontains='K-Fêt')
+        return list(kfet_groups) + list(other_groups)
 
     class Meta:
-        model  = User
+        model = User
         fields = ['groups']
 
 
@@ -343,12 +342,20 @@ class KPsulAccountForm(forms.ModelForm):
                 }),
         }
 
+
 class KPsulCheckoutForm(forms.Form):
     checkout = forms.ModelChoiceField(
-            queryset=Checkout.objects.filter(
-            is_protected=False, valid_from__lte=timezone.now(),
-            valid_to__gte=timezone.now()),
-            widget=forms.Select(attrs={'id':'id_checkout_select'}))
+        queryset=(
+            Checkout.objects
+            .filter(
+                is_protected=False,
+                valid_from__lte=timezone.now(),
+                valid_to__gte=timezone.now(),
+            )
+        ),
+        widget=forms.Select(attrs={'id': 'id_checkout_select'}),
+    )
+
 
 class KPsulOperationForm(forms.ModelForm):
     article = forms.ModelChoiceField(