summaryrefslogtreecommitdiff
path: root/chimere/main/views.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/main/views.py')
-rw-r--r--chimere/main/views.py14
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