2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fix EditorForm errors in changeset view

Browse source
This commit is contained in:
Laura Klünder 2017-06-21 12:51:44 +02:00
parent 7a9f4da4c1
commit 62467ed43e
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/c3nav/editor/views/changes.py
View file

@ -146,6 +146,8 @@ def group_changes(changeset, can_edit=False, show_history=False):
last_obj = obj last_obj = obj
form = changeset.wrap(type(obj)).EditorForm
change_data = { change_data = {
'pk': change.pk, 'pk': change.pk,
'author': change.author, 'author': change.author,
@ -200,11 +202,10 @@ def group_changes(changeset, can_edit=False, show_history=False):
order = 5 order = 5
if change.field_name == 'slug': if change.field_name == 'slug':
order = 1 order = 1
if change.field_name not in obj.__class__.EditorForm._meta.fields: if change.field_name not in form._meta.fields:
order = 0 order = 0
change_data.update({ change_data.update({
'order': (order, 'order': (order, form._meta.fields.index(change.field_name) if order else 1),
obj.__class__.EditorForm._meta.fields.index(change.field_name) if order else 1),
}) })
if not field_value: if not field_value:
change_data.update({ change_data.update({
@ -247,7 +248,7 @@ def group_changes(changeset, can_edit=False, show_history=False):
change_data.update({ change_data.update({
'title': field.verbose_name, 'title': field.verbose_name,
'value': objects[field.related_model][json.loads(change.field_value)].title, 'value': objects[field.related_model][json.loads(change.field_value)].title,
'order': (6, obj.__class__.EditorForm._meta.fields.index(change.field_name), 'order': (6, form._meta.fields.index(change.field_name),
(change.action == 'm2m_remove')), (change.action == 'm2m_remove')),
}) })
else: else: