reorder editor form fields
This commit is contained in:
parent
c66b492f8f
commit
a60a333f42
1 changed files with 6 additions and 4 deletions
|
@ -39,13 +39,14 @@ class MapitemFormMixin(ModelForm):
|
||||||
titles.update(self.instance.titles)
|
titles.update(self.instance.titles)
|
||||||
|
|
||||||
language_titles = dict(settings.LANGUAGES)
|
language_titles = dict(settings.LANGUAGES)
|
||||||
for language in titles.keys():
|
for language in reversed(titles.keys()):
|
||||||
new_title = self.data.get('title_' + language)
|
new_title = self.data.get('title_' + language)
|
||||||
if new_title is not None:
|
if new_title is not None:
|
||||||
titles[language] = new_title
|
titles[language] = new_title
|
||||||
self.fields['title_' + language] = CharField(label=language_titles.get(language, language),
|
self.fields['title_' + language] = CharField(label=language_titles.get(language, language),
|
||||||
required=False,
|
required=False,
|
||||||
initial=titles[language].strip(), max_length=50)
|
initial=titles[language].strip(), max_length=50)
|
||||||
|
self.fields.move_to_end('title_' + language, last=False)
|
||||||
self.titles = titles
|
self.titles = titles
|
||||||
|
|
||||||
def clean(self):
|
def clean(self):
|
||||||
|
@ -61,9 +62,10 @@ class MapitemFormMixin(ModelForm):
|
||||||
|
|
||||||
|
|
||||||
def create_editor_form(editor_model):
|
def create_editor_form(editor_model):
|
||||||
possible_fields = ['name', 'altitude', 'can_search', 'can_describe', 'color', 'public',
|
possible_fields = ['name', 'altitude', 'level', 'category', 'width', 'groups', 'color', 'public',
|
||||||
'groups', 'geometry', 'level', 'category', 'outside', 'stuffed', 'width']
|
'can_search', 'can_describe', 'outside', 'stuffed', 'geometry']
|
||||||
existing_fields = [field.name for field in editor_model._meta.get_fields() if field.name in possible_fields]
|
field_names = [field.name for field in editor_model._meta.get_fields()]
|
||||||
|
existing_fields = [name for name in possible_fields if name in field_names]
|
||||||
|
|
||||||
class EditorForm(MapitemFormMixin, ModelForm):
|
class EditorForm(MapitemFormMixin, ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue