diff options
| -rw-r--r-- | chimere/forms.py | 2 | ||||
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/chimere/forms.py b/chimere/forms.py index ed06805..d1ddceb 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -122,7 +122,7 @@ class MarkerAdminFormBase(forms.ModelForm): """ Main form for marker """ - description = forms.CharField(widget=TextareaWidget, blank=True, null=True) + description = forms.CharField(widget=TextareaWidget, required=None) class Meta: model = Marker diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index 4f8c5f0..c3ecf0e 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -275,6 +275,12 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { }, activateMarkerEdit: function(){ + if ($('#chimere_map_menu').length){ + $('#chimere_map_menu').hide(); + } + if (settings.current_popup != null) { + settings.current_popup.hide(); + } settings.map.events.unregister('click', settings.map, methods.displayMapMenu); settings.map.events.register('click', settings.map, @@ -852,12 +858,12 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { }, /* put the marker on the map and update latitude and longitude fields */ putEditMarker: function (lonlat, zoom){ - if (settings.current_feature) { - settings.layerMarkers.removeMarker(settings.current_feature); + if (settings.current_edit_feature) { + settings.layerMarkers.removeMarker(settings.current_edit_feature); } - settings.current_feature = new OpenLayers.Marker(lonlat.clone(), + settings.current_edit_feature = new OpenLayers.Marker(lonlat.clone(), settings.default_icon); - settings.layerMarkers.addMarker(settings.current_feature); + settings.layerMarkers.addMarker(settings.current_edit_feature); lonlat = lonlat.clone().transform(settings.map.getProjectionObject(), EPSG_DISPLAY_PROJECTION); $('#id_point').val('POINT(' + lonlat.lon + ' ' + lonlat.lat + ')'); |