diff options
| -rw-r--r-- | chimere/views.py | 80 |
1 files changed, 30 insertions, 50 deletions
diff --git a/chimere/views.py b/chimere/views.py index be10be6..21769a9 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -35,8 +35,8 @@ from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import reverse from django.db.models import Q from django.http import HttpResponseRedirect, HttpResponse, Http404 -from django.shortcuts import get_object_or_404, redirect, render_to_response -from django.template import RequestContext, defaultfilters +from django.shortcuts import get_object_or_404, redirect, render +from django.template import defaultfilters from django.utils.http import urlquote from django.utils.translation import ugettext as _ from django.views.generic import TemplateView, ListView @@ -233,8 +233,7 @@ def index(request, area_name=None, default_area=None, simple=False, tpl = 'chimere/main_map_simple.html' if get_response: return tpl, response_dct - return render_to_response(tpl, response_dct, - context_instance=RequestContext(request)) + return render(request, tpl, response_dct) def edit(request, area_name="", item_id=None, submited=False): @@ -407,17 +406,17 @@ def uploadFile(request, category_id='', area_name=''): routefile.save() if not category_id: response_dct['gpx_id'] = routefile.pk - return render_to_response( - 'chimere/upload_file.html', response_dct, - context_instance=RequestContext(request)) + return render( + request, + 'chimere/upload_file.html', response_dct) routefile.process() if not routefile.route: response_dct['errors'] = _( "Bad file. Please check it with an external software.") response_dct.update({'form': form}) - return render_to_response( - 'chimere/upload_file.html', response_dct, - context_instance=RequestContext(request)) + return render( + request, + 'chimere/upload_file.html', response_dct) route = Route(name=form.cleaned_data['name'], route=routefile.route, associated_file=routefile, status='S') @@ -430,8 +429,7 @@ def uploadFile(request, category_id='', area_name=''): # An unbound form form = Form() response_dct.update({'form': form}) - return render_to_response('chimere/upload_file.html', response_dct, - context_instance=RequestContext(request)) + return render(request, 'chimere/upload_file.html', response_dct) def processRouteFile(request, area_name='', file_id=None): @@ -506,9 +504,8 @@ def edit_page(get_edit, types, geom_name, widget, init_widget=True): # manualy populate the custom widget if 'subcategory' in form.data and form.data['subcategory']: response_dct['current_category'] = int(form.data['subcategory']) - return render_to_response('chimere/edit_{}.html'.format(geom_name), - response_dct, - context_instance=RequestContext(request)) + return render( + request, 'chimere/edit_{}.html'.format(geom_name), response_dct) return edit @@ -532,8 +529,7 @@ def submited(request, area_name="", action=""): if hasattr(settings, 'CONTACT_EMAIL') and settings.CONTACT_EMAIL: response_dct['contact_email'] = settings.CONTACT_EMAIL response_dct.update(dct) - return render_to_response('chimere/submited.html', response_dct, - context_instance=RequestContext(request)) + return render(request, 'chimere/submited.html', response_dct)\ def charte(request, area_name=""): @@ -545,8 +541,7 @@ def charte(request, area_name=""): return redir response_dct.update({'actions': actions(response_dct['area_name']), 'action_selected': ('charte',)}) - return render_to_response('chimere/charte.html', response_dct, - context_instance=RequestContext(request)) + return render('chimere/charte.html', response_dct, request) def contactus(request, area_name=""): @@ -577,8 +572,7 @@ def contactus(request, area_name=""): response_dct.update({'actions': actions(response_dct['area_name']), 'action_selected': ('contact',), 'contact_form': form, 'message': msg}) - return render_to_response('chimere/contactus.html', response_dct, - context_instance=RequestContext(request)) + return render(request, 'chimere/contactus.html', response_dct) def extraPage(request, area_name="", page_id=""): @@ -598,8 +592,7 @@ def extraPage(request, area_name="", page_id=""): 'title': page.title}) tpl = page.template_path if page.template_path \ else 'chimere/default_extra_page.html' - return render_to_response(tpl, response_dct, - context_instance=RequestContext(request)) + return render(request, tpl, response_dct) def getDetailUndefined(request, area_name): @@ -649,8 +642,7 @@ def getDetail(request, area_name, key, popup=False): and marker.start_date response_dct['routing_enabled'] = settings.CHIMERE_ENABLE_ROUTING response_dct['properties'] = marker.getProperties(area_name=area_name) - return render_to_response('chimere/detail.html', response_dct, - context_instance=RequestContext(request)) + return render(request, 'chimere/detail.html', response_dct) def getDescriptionDetail(request, area_name, category_id): @@ -665,8 +657,7 @@ def getDescriptionDetail(request, area_name, category_id): if redir: return redir response_dct['category'] = category - return render_to_response('chimere/category_detail.html', response_dct, - context_instance=RequestContext(request)) + return render(request, 'chimere/category_detail.html', response_dct) def checkDate(q): @@ -883,18 +874,16 @@ def get_available_categories(request, area_name=None, area=None, status='A', if area and area.dynamic_categories and \ "current_extent" not in request.GET: context_data['sub_categories'] = [] - return render_to_response( - 'chimere/blocks/categories.html', context_data, - context_instance=RequestContext(request)) + return render( + request, 'chimere/blocks/categories.html', context_data) if not area or not area.dynamic_categories: # Categories are not updated dynamicaly when the user move the map # so we return ALL the categories 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)) + return render( + request, 'chimere/blocks/categories.html', context_data) default_message = "<p class='warning'>%s</p>" % \ _("No category available in this area.") if "status" not in request.GET: # there must be a status @@ -919,8 +908,7 @@ def get_available_categories(request, area_name=None, area=None, status='A', subcategories = [(cat, list(subcats)) for cat, subcats in groupby(categories, get_cat)] context_data['sub_categories'] = subcategories - return render_to_response('chimere/blocks/categories.html', context_data, - context_instance=RequestContext(request)) + return render(request, 'chimere/blocks/categories.html', context_data) def getCategory(request, area_name='', category_id=0): @@ -1168,9 +1156,8 @@ def rss(request, area_name=''): elif request.POST['rss_category'] == 'poi': response_dct['category_rss_feed'] = 'category' response_dct['sub_categories'] = SubCategory.getAvailable() - return render_to_response( - 'chimere/feeds/rss.html', response_dct, - context_instance=RequestContext(request)) + return render( + request, 'chimere/feeds/rss.html', response_dct) # User wants to follow all the new POI situated in a defined area elif request.POST['rss_category'] == 'area': # An unbound form @@ -1184,9 +1171,7 @@ def rss(request, area_name=''): 'area_id': Area.getAvailable(), 'area_widget': area_widget }) - return render_to_response( - 'chimere/feeds/rss.html', response_dct, - context_instance=RequestContext(request)) + return render(request, 'chimere/feeds/rss.html', response_dct) # Error when submitting the form else: error = _("Incorrect choice in the list") @@ -1194,9 +1179,7 @@ def rss(request, area_name=''): 'error_message': error, 'category_rss_feed': '', 'sub_categories': SubCategory.getAvailable()}) - return render_to_response( - 'chimere/feeds/rss.html', response_dct, - context_instance=RequestContext(request)) + return render(request, 'chimere/feeds/rss.html', response_dct) # User has specified the category or subcategory he wants to follow => # we redirect him towards the related rss feed @@ -1248,8 +1231,7 @@ def rss(request, area_name=''): response_dct['category_rss_feed'] = 'category' response_dct['sub_categories'] = SubCategory.getAvailable( ['M', 'B']) - return render_to_response('chimere/feeds/rss.html', response_dct, - context_instance=RequestContext(request)) + return render(request, 'chimere/feeds/rss.html', response_dct) if request.GET['rss_category'] == 'area': # An unbound form form = AreaForm() @@ -1260,13 +1242,11 @@ def rss(request, area_name=''): 'category_rss_feed': 'area', 'area_id': Area.getAvailable(), 'area_widget': AreaWidget().render('area', None)}) - return render_to_response('chimere/feeds/rss.html', response_dct, - context_instance=RequestContext(request)) + return render(request, 'chimere/feeds/rss.html', response_dct) # User access to the RSS tab else: - return render_to_response('chimere/feeds/rss.html', response_dct, - context_instance=RequestContext(request)) + return render(request, 'chimere/feeds/rss.html', response_dct) # from django.core.paginator import Paginator, InvalidPage |