diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-09-09 17:01:17 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-09-09 17:01:17 +0200 |
| commit | d3b04460bbb5d1e7eb7ed28220ae305cce6ad6e2 (patch) | |
| tree | 6c26a535ef8532b912ff892d5936c013015dabfc /chimere/main/views.py | |
| parent | 0ccc30e337bb046000fb76d2337c2fb9792bc71f (diff) | |
| download | Chimère-d3b04460bbb5d1e7eb7ed28220ae305cce6ad6e2.tar.bz2 Chimère-d3b04460bbb5d1e7eb7ed28220ae305cce6ad6e2.zip | |
Association of a GPX (or KML) file to a route (closes #302)
- template file for upload
- js finalisation and debug
- css
- "artwork"
- french translation
Diffstat (limited to 'chimere/main/views.py')
| -rw-r--r-- | chimere/main/views.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chimere/main/views.py b/chimere/main/views.py index 812fff6..98c514d 100644 --- a/chimere/main/views.py +++ b/chimere/main/views.py @@ -166,12 +166,12 @@ def uploadFile(request, area_name=''): routefile.save() response_dct = get_base_response(area_name) response_dct['gpx_id'] = routefile.pk - return render_to_response('uploadFile.html', response_dct) + return render_to_response('upload_file.html', response_dct) else: # An unbound form form = FileForm() response_dct.update({'form':form}) - return render_to_response('uploadFile.html', response_dct) + return render_to_response('upload_file.html', response_dct) def processRouteFile(request, area_name='', file_id=None): if file_id: @@ -181,7 +181,8 @@ def processRouteFile(request, area_name='', file_id=None): route = route_file.route if not route: return HttpResponse(status=500) - return HttpResponse(simplejson.dumps({'wkt':route}), + return HttpResponse(simplejson.dumps({'wkt':route, + 'file_id':file_id}), 'application/javascript', status=200) except: return HttpResponse(status=500) @@ -209,7 +210,7 @@ def editRoute(request, area_name=""): else: # An unbound form form = RouteForm() - # get the « manualy » declared_fields. Ie: properties + # get the "manualy" declared_fields. Ie: properties declared_fields = form.declared_fields.keys() response_dct = get_base_response(area_name) response_dct.update({'actions':actions, @@ -221,8 +222,9 @@ def editRoute(request, area_name=""): 'extra_head':form.media, 'sub_categories':SubCategory.getAvailable(['R', 'B'], area_name), - 'route_widget':RouteChooserWidget().render('route', None, - area_name=area_name), + 'route_widget':RouteChooserWidget().render('route', '', + area_name=area_name, + routefile_id='',), 'properties':declared_fields }) # manualy populate the custom widget |