Skip to content

Commit

Permalink
Merge pull request #129 from Anaethelion/master
Browse files Browse the repository at this point in the history
Make sure we do not parse bad values
  • Loading branch information
Gaël UTARD committed Dec 16, 2015
2 parents 613f5f6 + 9b06679 commit eddc49c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
3 changes: 3 additions & 0 deletions leaflet/forms/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from __future__ import unicode_literals

from django import forms
from django.core import validators
from django.template.defaultfilters import slugify
try:
from django.contrib.gis.forms.widgets import BaseGeometryWidget
Expand Down Expand Up @@ -37,6 +38,8 @@ def serialize(self, value):
def render(self, name, value, attrs=None):
assert self.map_srid == 4326, 'Leaflet vectors should be decimal degrees.'

value = None if value in validators.EMPTY_VALUES else value

# Retrieve params from Field init (if any)
self.geom_type = self.attrs.get('geom_type', self.geom_type)

Expand Down
5 changes: 5 additions & 0 deletions leaflet/tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ class LeafletWidgetMedia(LeafletWidget):
self.assertIn('leaflet/leaflet.css', media_css)
self.assertIn('leaflet/draw/leaflet.draw.css', media_css)

def test_widget_geometry_is_empty_string(self):
widget = LeafletWidget()
widget.render('geom', '', {'id': 'geom'})
self.assertTrue(True, 'We should\'t accept blank geometry in value.')


class LeafletFieldsWidgetsTest(SimpleTestCase):
def test_default_widget(self):
Expand Down

0 comments on commit eddc49c

Please sign in to comment.