Skip to content

Commit eddc49c

Browse files
author
Gaël UTARD
committed
Merge pull request #129 from Anaethelion/master
Make sure we do not parse bad values
2 parents 613f5f6 + 9b06679 commit eddc49c

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

leaflet/forms/widgets.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from __future__ import unicode_literals
33

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

41+
value = None if value in validators.EMPTY_VALUES else value
42+
4043
# Retrieve params from Field init (if any)
4144
self.geom_type = self.attrs.get('geom_type', self.geom_type)
4245

leaflet/tests/tests.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ class LeafletWidgetMedia(LeafletWidget):
8989
self.assertIn('leaflet/leaflet.css', media_css)
9090
self.assertIn('leaflet/draw/leaflet.draw.css', media_css)
9191

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

9398
class LeafletFieldsWidgetsTest(SimpleTestCase):
9499
def test_default_widget(self):

0 commit comments

Comments
 (0)