diff --git a/functions/custom_fields.py b/functions/custom_fields.py index b147865c..b88502bd 100644 --- a/functions/custom_fields.py +++ b/functions/custom_fields.py @@ -62,7 +62,7 @@ class JSONField(models.TextField): def get_db_prep_value(self, value, connection, prepared=True): """Convert our JSON object to a string before we save""" return json.dumps(value) - + ''' def get_db_prep_save(self, value, connection): """Convert our JSON object to a string before we save""" @@ -73,6 +73,7 @@ class JSONField(models.TextField): value = json.dumps(value, cls=DjangoJSONEncoder) return value + ''' DEFAULT_WIDTH = 590 @@ -101,10 +102,15 @@ class LocationWidget(forms.TextInput): if isinstance(value, basestring): a = json.loads(value) lat, lng, address = float(a['lat']), float(a['lng']), a['address'] + else: lat, lng, address = float(value['lat']), float(value['lng']), value['address'] - curLocation = json.dumps(value, cls=DjangoJSONEncoder) + + if isinstance(value, basestring): + curLocation = value + else: + curLocation = json.dumps(value, cls=DjangoJSONEncoder) js = ''' {# google map не забыть скачать скрипты на локал #} @@ -17,8 +18,6 @@ - - {% endblock %} {% block body %} @@ -171,6 +170,18 @@
{{ value }}
+ {% endfor %} + + {% endfor %} +