Morpheus/gestioCOF
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Reapply fix to kfetauth (…) and fix tests

Browse source
This commit is contained in:
Aurélien Delobelle 2017-10-24 17:56:14 +02:00
parent 1cc51f17a3
commit af3a7cf697
3 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kfet/auth/forms.py
View file

@ -18,6 +18,8 @@ class GroupForm(forms.ModelForm):
# 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],
)
@ -36,6 +38,8 @@ class UserGroupForm(forms.ModelForm):
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)