[svn] Brief code cleanup.

core/views_caves.py

@@ -4,7 +4,7 @@ import troggle.settings as settings
 from django.forms.models import formset_factory
 import search
 from django.core.urlresolvers import reverse
-from troggle.alwaysUseRequestContext import render_response # see views_logbooks for explanation on this.
+from utils import render_with_context # see views_logbooks for explanation on this.
 from django.http import HttpResponseRedirect
 from django.conf import settings
 import re, urlparse
@@ -21,20 +21,20 @@ def caveindex(request):
     caves = Cave.objects.all()
     notablecavehrefs = [ "161", "204", "258", "76" ]  # could detect notability by trips and notability of people who have been down them
     notablecaves = [Cave.objects.get(kataster_number=kataster_number)  for kataster_number in notablecavehrefs ]
-    return render_response(request,'caveindex.html', {'caves': caves, 'notablecaves':notablecaves})
+    return render_with_context(request,'caveindex.html', {'caves': caves, 'notablecaves':notablecaves})
 
 def cave(request, cave_id='', offical_name=''):
     cave=getCave(cave_id)
     if cave.non_public and not request.user.is_authenticated():
-        return render_response(request,'nonpublic.html', {'instance': cave})
+        return render_with_context(request,'nonpublic.html', {'instance': cave})
     else:
-        return render_response(request,'cave.html', {'cave': cave})
+        return render_with_context(request,'cave.html', {'cave': cave})
     
 def qm(request,cave_id,qm_id,year,grade=None):
     year=int(year)
     try:
         qm=getCave(cave_id).get_QMs().get(number=qm_id,found_by__date__year=year)
-        return render_response(request,'qm.html',locals())
+        return render_with_context(request,'qm.html',locals())
 
     except QM.DoesNotExist:
         url=urlparse.urljoin(settings.URL_ROOT, r'/admin/expo/qm/add/'+'?'+  r'number=' + qm_id)
@@ -46,7 +46,7 @@ def qm(request,cave_id,qm_id,year,grade=None):
 def ent(request, cave_id, ent_letter):
     cave = Cave.objects.filter(kataster_number = cave_id)[0]
     cave_and_ent = CaveAndEntrance.objects.filter(cave = cave).filter(entrance_letter = ent_letter)[0]
-    return render_response(request,'entrance.html', {'cave': cave,
+    return render_with_context(request,'entrance.html', {'cave': cave,
                                                 'entrance': cave_and_ent.entrance,
                                                 'letter': cave_and_ent.entrance_letter,})
 
@@ -54,7 +54,7 @@ def survexblock(request, survexpath):
     survexblock = models.SurvexBlock.objects.get(survexpath=survexpath)
     #ftext = survexblock.filecontents()
     ftext = survexblock.text
-    return render_response(request,'survexblock.html', {'survexblock':survexblock, 'ftext':ftext, })
+    return render_with_context(request,'survexblock.html', {'survexblock':survexblock, 'ftext':ftext, })
 
 def subcave(request, cave_id, subcave):
     print subcave
@@ -67,7 +67,7 @@ def subcave(request, cave_id, subcave):
             if subcaveUrlSegment:
                 subcave=subcave.children.get(title=subcaveUrlSegment)
     print subcave
-    return render_response(request,'subcave.html', {'subcave': subcave,'cave':cave})
+    return render_with_context(request,'subcave.html', {'subcave': subcave,'cave':cave})
 
 def caveSearch(request):
     query_string = ''
@@ -77,13 +77,13 @@ def caveSearch(request):
         entry_query = search.get_query(query_string, ['underground_description','official_name',])
         found_entries = Cave.objects.filter(entry_query)
 
-    return render_response(request,'cavesearch.html',
+    return render_with_context(request,'cavesearch.html',
                           { 'query_string': query_string, 'found_entries': found_entries,})
 
 def surveyindex(request):
     surveys=Survey.objects.all()
     expeditions=Expedition.objects.order_by("-year")
-    return render_response(request,'survey.html',locals())
+    return render_with_context(request,'survey.html',locals())
 
 def survey(request,year,wallet_number):
     surveys=Survey.objects.all()
@@ -96,4 +96,4 @@ def survey(request,year,wallet_number):
             planSketches=current_survey.scannedimage_set.filter(contents='plan')
             elevationSketches=current_survey.scannedimage_set.filter(contents='elevation')
     
-    return render_response(request,'survey.html', locals())
+    return render_with_context(request,'survey.html', locals())