Skip to content

Commit

Permalink
Remove some pointless differences from upstream master
Browse files Browse the repository at this point in the history
  • Loading branch information
slinkp committed Mar 29, 2012
1 parent 48c5268 commit c3f1002
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion django-olwidget/olwidget/fields.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from django import forms

from olwidget.widgets import Map, EditableLayer, InfoLayer

from django.contrib.gis.forms.fields import GeometryField


class MapField(forms.fields.Field):
"""
Container field for map fields. Similar to MultiValueField, but with
Expand Down
2 changes: 1 addition & 1 deletion django-olwidget/olwidget/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def fix_cleaned_data(cleaned_data, initial_data_keymap):
cleaned_data[keys[0]] = vals
return cleaned_data

def apply_maps_to_modelform_fields(fields, maps, default_options=None,
def apply_maps_to_modelform_fields(fields, maps, default_options=None,
default_template=None, default_field_class=None):
"""
Rearranges fields to match those defined in ``maps``. ``maps`` is a list
Expand Down
6 changes: 4 additions & 2 deletions django-olwidget/olwidget/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,10 @@ def get_extra_context(self):
by the javascript in self.template. This is invoked by
self.render().
You'll also want to override the template to make use of the
provided data.
Return value should be a dictionary where keys are strings and
values are valid javascript, eg. JSON-encoded data. You'll
also want to override the template to make use of the provided
data.
"""
return {}

Expand Down

0 comments on commit c3f1002

Please sign in to comment.