Fix route submission

1 files changed, 13 insertions, 2 deletions

diff --git a/chimere/forms.py b/chimere/forms.py
index e7115a5..3a93b55 100644
--- a/chimere/forms.py
+++ b/chimere/forms.py
@@ -232,7 +232,7 @@ class RouteForm(RouteAdminForm):
     """
     Form for the edit page
     """
-    picture = forms.ImageField(label=_("Image"), required=False)
+    description = forms.CharField(widget=TextareaWidget, required=False)
     point = forms.CharField(label=" ", required=False, widget=forms.HiddenInput)
     associated_file_id = forms.CharField(label=" ", required=False,
                                    widget=forms.HiddenInput)
@@ -243,8 +243,19 @@ class RouteForm(RouteAdminForm):
     def __init__(self, *args, **kwargs):
         if kwargs.get('instance'):
             try:
+                marker = Marker.objects.get(route=kwargs['instance'])
                 kwargs['initial'] = {
-                    'point':Marker.objects.get(route=kwargs['instance']).point}
+                    'point':marker.point,
+                    'description':marker.description}
+                property_dct = {}
+                for pm in PropertyModel.objects.filter(available=True):
+                    property  = marker.getProperty(pm)
+                    if property:
+                        property_dct[pm.getNamedId()] = property.value
+                if 'initial' in kwargs:
+                    kwargs['initial'].update(property_dct)
+                else:
+                    kwargs['initial'] = property_dct
             except:
                 pass
         super(RouteForm, self).__init__(*args, **kwargs)