Fix area_name for urls

1 files changed, 9 insertions, 8 deletions

diff --git a/chimere/views.py b/chimere/views.py
index 188a5b7..4bd6758 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -141,8 +141,8 @@ def get_edit_page(redirect_url, item_cls, item_form):
             try:
                 init_item = item_cls.objects.get(pk=item_id)
             except:
-                return redirect(redirect_url, area_name if area_name else ''),\
-                       None, None
+                return redirect(redirect_url, area_name + '/' if area_name \
+                                else ''), None, None
             ref_item = init_item
             modified_item = item_cls.objects.filter(ref_item=init_item,
                                submiter_session_key=request.session.session_key)
@@ -196,7 +196,7 @@ def get_edit_page(redirect_url, item_cls, item_form):
                 notifySubmission(item)
                 response_dct = get_base_response(area_name)
                 return redirect(redirect_url + '-item',
-                            area_name if area_name else '',
+                            area_name + '/' if area_name else '',
                             item.ref_item.pk, 'submited'), None, subcategories
             else:
                 response_dct['error_message'] = _(u"There are missing field(s)"
@@ -239,7 +239,7 @@ def edit(request, area_name="", item_id=None, submited=False):
         'sub_categories':sub_categories,
         'point_widget':PointChooserWidget().render('point',
               init_item.point if init_item else None,
-              area_name=area_name),
+              area_name=response_dct['area_name']),
         'properties':declared_fields,
         'submited':submited
     })
@@ -341,7 +341,7 @@ def editRoute(request, area_name="", item_id=None, submited=False):
         'sub_categories':sub_categories,
         'route_widget':RouteChooserWidget().render('route',
                        init_item.route if init_item else None,
-                       area_name=area_name, routefile_id='',),
+                       area_name=response_dct['area_name'], routefile_id='',),
         'properties':declared_fields,
         'submited':submited
     })
@@ -435,7 +435,7 @@ def getDetail(request, area_name, marker_id):
     parameters = u'current_feature=%s' % marker_id
     parameters += u"&checked_categories=%s" % "_".join([str(m.id) \
                                               for m in marker.categories.all()])
-    net_dct = getTinyfiedUrl(parameters, area_name)
+    net_dct = getTinyfiedUrl(parameters, response_dct['area_name'])
     share_networks = []
     for network in settings.SHARE_NETWORKS:
         share_networks.append((network[0], network[1] % net_dct, network[2]))
@@ -529,7 +529,8 @@ def get_available_categories(request, area_name=None, area=None, status='A',
     if not settings.CHIMERE_DYNAMIC_CATEGORIES:
         # Categories are not updated dynamicaly when the user move the map
         # so we return ALL the categories
-        subcategories = SubCategory.getAvailable(area_name=area_name)
+        subcategories = SubCategory.getAvailable(
+                                            area_name=context_data['area_name'])
         context_data['sub_categories'] = subcategories
         return render_to_response('chimere/blocks/categories.html', context_data,
                                        context_instance=RequestContext(request))
@@ -546,7 +547,7 @@ def get_available_categories(request, area_name=None, area=None, status='A',
         # bad extent format
         return HttpResponse(default_message)
     # if not force and area.isIn(SimpleArea(cookie.AREA):return
-    categories = area.getCategories(status, area_name=area_name)
+    categories = area.getCategories(status, area_name=context_data['area_name'])
     if not categories:
         return HttpResponse(default_message)
     get_cat = lambda subcat: subcat.category