sort groups in editor form
This commit is contained in:
parent
aef26e3492
commit
a8bdb75c32
1 changed files with 6 additions and 1 deletions
|
@ -107,7 +107,8 @@ class EditorFormBase(I18nModelFormMixin, ModelForm):
|
||||||
self.fields.pop('groups')
|
self.fields.pop('groups')
|
||||||
|
|
||||||
for category in categories:
|
for category in categories:
|
||||||
choices = tuple((str(group.pk), group.title) for group in category.groups.all())
|
choices = tuple((str(group.pk), group.title)
|
||||||
|
for group in sorted(category.groups.all(), key=self.sort_group))
|
||||||
category_groups = set(group.pk for group in category.groups.all())
|
category_groups = set(group.pk for group in category.groups.all())
|
||||||
initial = tuple(str(pk) for pk in instance_groups if pk in category_groups)
|
initial = tuple(str(pk) for pk in instance_groups if pk in category_groups)
|
||||||
if category.single:
|
if category.single:
|
||||||
|
@ -192,6 +193,10 @@ class EditorFormBase(I18nModelFormMixin, ModelForm):
|
||||||
self.missing_fields = tuple((name, field) for name, field in self.fields.items()
|
self.missing_fields = tuple((name, field) for name, field in self.fields.items()
|
||||||
if name not in self.data and not field.required)
|
if name not in self.data and not field.required)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def sort_group(group):
|
||||||
|
return (-group.priority, group.title)
|
||||||
|
|
||||||
def clean_redirect_slugs(self):
|
def clean_redirect_slugs(self):
|
||||||
old_redirect_slugs = set(self.redirect_slugs)
|
old_redirect_slugs = set(self.redirect_slugs)
|
||||||
new_redirect_slugs = set(s for s in (s.strip() for s in self.cleaned_data['redirect_slugs'].split(',')) if s)
|
new_redirect_slugs = set(s for s in (s.strip() for s in self.cleaned_data['redirect_slugs'].split(',')) if s)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue