diff options
Diffstat (limited to 'chimere/main/views.py')
| -rw-r--r-- | chimere/main/views.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chimere/main/views.py b/chimere/main/views.py index f8c93dc..0707caa 100644 --- a/chimere/main/views.py +++ b/chimere/main/views.py @@ -230,7 +230,7 @@ details.") 'contact_form':form, 'message':msg}) return render_to_response('contactus.html', response_dct) -def getDetail(request, marker_id): +def getDetail(request, area_name, marker_id): ''' Get the detail for a marker ''' @@ -246,7 +246,7 @@ def getDetail(request, marker_id): response_dct['simple'] = True return render_to_response('detail.html', response_dct) -def getDescriptionDetail(request, category_id): +def getDescriptionDetail(request, area_name, category_id): ''' Get the description for a category ''' @@ -254,11 +254,11 @@ def getDescriptionDetail(request, category_id): category = Category.objects.filter(id=int(category_id))[0] except (ValueError, IndexError): return HttpResponse('no results') - response_dct = get_base_response() + response_dct = get_base_response(area_name) response_dct['category'] = category return render_to_response('category_detail.html', response_dct) -def getGeoObjects(request, category_ids, status): +def getGeoObjects(request, area_name, category_ids, status): ''' Get the JSON for markers and routes ''' @@ -293,13 +293,13 @@ def getGeoObjects(request, category_ids, status): data = '{"type": "FeatureCollection", "features":[%s]}' % ",".join(jsons) return HttpResponse(data) -def getAvailableCategories(request, area=None, status='A', force=None): +def getAvailableCategories(request, area_name=None, area=None, status='A', force=None): ''' Get categories for a designed area ''' if settings.DYNAMIC_CATEGORIES and not area: return "" - response_dct = get_base_response() + response_dct = get_base_response('area_name') if not settings.DYNAMIC_CATEGORIES: subcategories = SubCategory.getAvailable() response_dct['sub_categories'] = subcategories |