diff options
Diffstat (limited to 'expo/views_caves.py')
| -rw-r--r-- | expo/views_caves.py | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/expo/views_caves.py b/expo/views_caves.py index 684f4b4..f2ddad8 100644 --- a/expo/views_caves.py +++ b/expo/views_caves.py @@ -1,57 +1,57 @@ -from django.shortcuts import render_to_response
from troggle.expo.models import Cave, CaveAndEntrance, Survey, Expedition
import troggle.expo.models as models
import troggle.settings as settings
from troggle.expo.forms import CaveForm
import search
+from troggle.alwaysUseRequestContext import render_response # see views_logbooks for explanation on this.
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(href=href) for href in notablecavehrefs ]
- return render_to_response('caveindex.html', {'caves': caves, 'notablecaves':notablecaves, 'settings': settings})
+ return render_response(request,'caveindex.html', {'caves': caves, 'notablecaves':notablecaves})
-def cavehref(request, href):
- cave = Cave.objects.get(href=href)
- return render_to_response('cave.html', {'cave': cave, 'settings': settings})
+def cavehref(request, cave_id='', offical_name=''):
+ try:
+ cave = Cave.objects.get(kataster_number=cave_id)
+ except DoesNotExist:
+ cave = Cave.objects.get(unofficial_number=cave_id)
+ return render_response(request,'cave.html', {'cave': cave,})
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_to_response('entrance.html', {'cave': cave,
+ return render_response(request,'entrance.html', {'cave': cave,
'entrance': cave_and_ent.entrance,
- 'letter': cave_and_ent.entrance_letter,
- 'settings': settings})
+ 'letter': cave_and_ent.entrance_letter,})
+
def survexblock(request, survexpath):
survexblock = models.SurvexBlock.objects.get(survexpath=survexpath)
#ftext = survexblock.filecontents()
ftext = survexblock.text
- return render_to_response('survexblock.html', {'survexblock':survexblock, 'ftext':ftext, 'settings':settings })
+ return render_response(request,'survexblock.html', {'survexblock':survexblock, 'ftext':ftext, })
def caveArea(request, name):
cavearea = models.CaveArea.objects.get(name = name)
cave = cavearea.cave
- return render_to_response('cavearea.html', {'cavearea': cavearea, 'cave': cave, 'settings':settings })
+ return render_response(request,'cavearea.html', {'cavearea': cavearea, 'cave': cave,})
def caveSearch(request):
query_string = ''
found_entries = None
if ('q' in request.GET) and request.GET['q'].strip():
query_string = request.GET['q']
- entry_query = search.get_query(query_string, ['underground_description','official_name',])
- found_entries = Cave.objects.filter(entry_query)
+ entry_query = search.get_query(query_string, ['underground_description','official_name',])
+ found_entries = Cave.objects.filter(entry_query)
- return render_to_response('cavesearch.html',
- { 'query_string': query_string, 'found_entries': found_entries, 'settings': settings})
- #context_instance=RequestContext(request))
+ return render_response(request,'cavesearch.html',
+ { 'query_string': query_string, 'found_entries': found_entries,})
def surveyindex(request):
surveys=Survey.objects.all()
expeditions=Expedition.objects.all()
- dictToPass=locals()
- dictToPass.update({'settings':settings})
- return render_to_response('survey.html',dictToPass)
+ return render_response(request,'survey.html',locals())
def survey(request,year,wallet_number):
surveys=Survey.objects.all()
@@ -63,9 +63,6 @@ def survey(request,year,wallet_number): notes=current_survey.scannedimage_set.filter(contents='notes')
planSketches=current_survey.scannedimage_set.filter(contents='plan')
elevationSketches=current_survey.scannedimage_set.filter(contents='elevation')
-
- dictToPass=locals()
- dictToPass.update({'settings':settings})
- return render_to_response('survey.html',dictToPass)
+ return render_response(request,'survey.html', locals())
|