Merge branch 'master' into test/views

kfet/forms.py

@@ -5,9 +5,8 @@ from decimal import Decimal
 
 from django import forms
 from django.core.exceptions import ValidationError
-from django.contrib.auth.models import User, Group, Permission
-from django.contrib.contenttypes.models import ContentType
-from django.forms import modelformset_factory, widgets
+from django.contrib.auth.models import User
+from django.forms import modelformset_factory
 from django.utils import timezone
 
 from djconfig.forms import ConfigForm
@@ -18,6 +17,8 @@ from kfet.models import (
     TransferGroup, Supplier)
 from gestioncof.models import CofProfile
 
+from .auth.forms import UserGroupForm  # noqa
+
 
 # -----
 # Widgets
@@ -128,65 +129,6 @@ class UserRestrictTeamForm(UserForm):
         fields = ['first_name', 'last_name', 'email']
 
 
-class UserGroupForm(forms.ModelForm):
-    groups = forms.ModelMultipleChoiceField(
-            Group.objects.filter(name__icontains='K-Fêt'),
-            label='Statut équipe',
-            required=False)
-
-    def clean_groups(self):
-        kfet_groups = self.cleaned_data.get('groups')
-        if self.instance.pk is None:
-            return kfet_groups
-        other_groups = self.instance.groups.exclude(name__icontains='K-Fêt')
-        return list(kfet_groups) + list(other_groups)
-
-    class Meta:
-        model = User
-        fields = ['groups']
-
-
-class KFetPermissionsField(forms.ModelMultipleChoiceField):
-
-    def __init__(self, *args, **kwargs):
-        queryset = Permission.objects.filter(
-            content_type__in=ContentType.objects.filter(app_label="kfet"),
-        )
-        super().__init__(
-            queryset=queryset,
-            widget=widgets.CheckboxSelectMultiple,
-            *args, **kwargs
-        )
-
-    def label_from_instance(self, obj):
-        return obj.name
-
-
-class GroupForm(forms.ModelForm):
-    permissions = KFetPermissionsField()
-
-    def clean_name(self):
-        name = self.cleaned_data['name']
-        return 'K-Fêt %s' % name
-
-    def clean_permissions(self):
-        kfet_perms = self.cleaned_data['permissions']
-        # TODO: With Django >=1.11, the QuerySet method 'difference' can be used.
-        # other_groups = self.instance.permissions.difference(
-        #     self.fields['permissions'].queryset
-        # )
-        if self.instance.pk is None:
-            return kfet_perms
-        other_perms = self.instance.permissions.exclude(
-            pk__in=[p.pk for p in self.fields['permissions'].queryset],
-        )
-        return list(kfet_perms) + list(other_perms)
-
-    class Meta:
-        model = Group
-        fields = ['name', 'permissions']
-
-
 class AccountNegativeForm(forms.ModelForm):
     class Meta:
         model  = AccountNegative