From 0f1bf1be29268d41a61a874a54eda5edda0e465e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 14 Jul 2019 14:48:35 +0200 Subject: [PATCH] manager: sort groups in page visibility form (#34818) --- combo/manager/forms.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/combo/manager/forms.py b/combo/manager/forms.py index 1767e659..9ca54414 100644 --- a/combo/manager/forms.py +++ b/combo/manager/forms.py @@ -26,6 +26,10 @@ from combo.data.models import Page from .fields import ImageIncludingSvgField +def get_groups_as_choices(): + return [(x.id, x.name) for x in Group.objects.all().order_by('name')] + + class PageEditTitleForm(forms.ModelForm): class Meta: model = Page @@ -61,6 +65,11 @@ class PageEditPictureForm(forms.ModelForm): class PageVisibilityForm(forms.ModelForm): + groups = forms.MultipleChoiceField( + label=_('Groups'), + required=False, + choices=get_groups_as_choices) + class Meta: model = Page fields = ('public', 'groups') @@ -105,10 +114,6 @@ class PageEditExcludeFromNavigationForm(forms.ModelForm): fields = ('exclude_from_navigation',) -def get_groups_as_choices(): - return [(x.id, x.name) for x in Group.objects.all().order_by('name')] - - class CellVisibilityForm(forms.Form): visibility = forms.ChoiceField( label=_('Visibility'),