Skip to content

form.fields is collections.OrderedDict in dj 1.7 #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Christophe31 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

form.fields is collections.OrderedDict in dj 1.7 #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions django-olwidget/olwidget/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ def apply_maps_to_modelform_fields(fields, maps, default_options=None,
min_pos = 65535 # arbitrarily high number for field ordering
initial = []
for field_name in field_list:
min_pos = min(min_pos, fields.keyOrder.index(field_name))
key_order = fields.keyOrder if hasattr(fields, "keyOrder") else list(fields)
min_pos = min(min_pos, key_order.index(field_name))
field = fields.pop(field_name)
initial.append(field_name)
if not isinstance(field.widget, (Map, BaseVectorLayer)):
Expand All @@ -170,7 +171,10 @@ def apply_maps_to_modelform_fields(fields, maps, default_options=None,
map_field = default_field_class(layer_fields, map_opts, layer_names=names,
label=", ".join(forms.forms.pretty_name(f) for f in field_list),
template=template)
fields.insert(min_pos, map_name, map_field)
if hasattr(fields, "insert"):
fields.insert(min_pos, map_name, map_field)
else:
fields[map_name] = map_field
initial_data_keymap[map_name] = initial
return initial_data_keymap