Skip to content
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.

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

Add django 1.11 support #84

Merged
merged 2 commits into from
May 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions geoposition/templates/geoposition/widgets/geoposition.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,23 @@
<table>
<tr>
<td>{{ latitude.label|capfirst }}</td>
<td>{{ latitude.html }}</td>
<td>
{% if latitude.widget %}
{% include latitude.widget.template_name with widget=latitude.widget %}
{% else %}
{{ latitude.html }}
{% endif %}
</td>
</tr>
<tr>
<td>{{ longitude.label|capfirst }}</td>
<td>{{ longitude.html }}</td>
<td>
{% if longitude.widget %}
{% include longitude.widget.template_name with widget=longitude.widget %}
{% else %}
{{ longitude.html }}
{% endif %}
</td>
</tr>
</table>
</div>
33 changes: 28 additions & 5 deletions geoposition/widgets.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
from __future__ import unicode_literals

import json

from django import forms
from django.template.loader import render_to_string
from django.utils import six
from django.utils.translation import ugettext_lazy as _

from .conf import settings


class GeopositionWidget(forms.MultiWidget):
template_name = 'geoposition/widgets/geoposition.html'

def __init__(self, attrs=None):
widgets = (
forms.TextInput(),
Expand All @@ -23,7 +27,30 @@ def decompress(self, value):
return [value.latitude, value.longitude]
return [None, None]

def get_config(self):
return {
'map_widget_height': settings.MAP_WIDGET_HEIGHT or 500,
'map_options': json.dumps(settings.MAP_OPTIONS),
'marker_options': json.dumps(settings.MARKER_OPTIONS),
}


def get_context(self, name, value, attrs):
# Django 1.11 and up
context = super(GeopositionWidget, self).get_context(name, value, attrs)
context['latitude'] = {
'widget': context['widget']['subwidgets'][0],
'label': _("latitude"),
}
context['longitude'] = {
'widget': context['widget']['subwidgets'][1],
'label': _("longitude"),
}
context['config'] = self.get_config()
return context

def format_output(self, rendered_widgets):
# Django 1.10 and down
return render_to_string('geoposition/widgets/geoposition.html', {
'latitude': {
'html': rendered_widgets[0],
Expand All @@ -33,11 +60,7 @@ def format_output(self, rendered_widgets):
'html': rendered_widgets[1],
'label': _("longitude"),
},
'config': {
'map_widget_height': settings.MAP_WIDGET_HEIGHT or 500,
'map_options': json.dumps(settings.MAP_OPTIONS),
'marker_options': json.dumps(settings.MARKER_OPTIONS),
}
'config': self.get_config(),
})

class Media:
Expand Down