From 79d80b5c592d663569469907ae13209154aa323d Mon Sep 17 00:00:00 2001 From: Nick Smith Date: Tue, 8 Jul 2014 12:49:38 +0100 Subject: [PATCH] Amend GroupForm.save(), so as not to blat non-user-facing django permissions --- wagtail/wagtailusers/forms.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailusers/forms.py b/wagtail/wagtailusers/forms.py index 06ae6bbbf..953d6b071 100644 --- a/wagtail/wagtailusers/forms.py +++ b/wagtail/wagtailusers/forms.py @@ -179,9 +179,10 @@ class GroupForm(forms.ModelForm): # be clobbered by this form. try: untouchable_permissions = self.instance.permissions.exclude(pk__in=self.registered_permissions) + bool(untouchable_permissions) # force this to be evaluated, as it's about to change except ValueError: # this form is not bound; we're probably creating a new group - untouchable_permissions = Permission.objects.none() + untouchable_permissions = [] group = super(GroupForm, self).save() group.permissions.add(*untouchable_permissions) return group