manager: sort groups in page visibility form (#34818)
This commit is contained in:
parent
a72c25dd59
commit
0f1bf1be29
|
@ -26,6 +26,10 @@ from combo.data.models import Page
|
||||||
from .fields import ImageIncludingSvgField
|
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 PageEditTitleForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Page
|
model = Page
|
||||||
|
@ -61,6 +65,11 @@ class PageEditPictureForm(forms.ModelForm):
|
||||||
|
|
||||||
|
|
||||||
class PageVisibilityForm(forms.ModelForm):
|
class PageVisibilityForm(forms.ModelForm):
|
||||||
|
groups = forms.MultipleChoiceField(
|
||||||
|
label=_('Groups'),
|
||||||
|
required=False,
|
||||||
|
choices=get_groups_as_choices)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Page
|
model = Page
|
||||||
fields = ('public', 'groups')
|
fields = ('public', 'groups')
|
||||||
|
@ -105,10 +114,6 @@ class PageEditExcludeFromNavigationForm(forms.ModelForm):
|
||||||
fields = ('exclude_from_navigation',)
|
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):
|
class CellVisibilityForm(forms.Form):
|
||||||
visibility = forms.ChoiceField(
|
visibility = forms.ChoiceField(
|
||||||
label=_('Visibility'),
|
label=_('Visibility'),
|
||||||
|
|
Loading…
Reference in New Issue