diff options
Diffstat (limited to 'core/views_caves.py')
| -rw-r--r-- | core/views_caves.py | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/core/views_caves.py b/core/views_caves.py index a785170..af76b1e 100644 --- a/core/views_caves.py +++ b/core/views_caves.py @@ -10,11 +10,10 @@ from troggle.helper import login_required_if_public from django.forms.models import modelformset_factory from django import forms from django.core.urlresolvers import reverse -from utils import render_with_context # see views_logbooks for explanation on this. from django.http import HttpResponse, HttpResponseRedirect from django.conf import settings import re, urlparse -from django.shortcuts import get_object_or_404 +from django.shortcuts import get_object_or_404, render import settings @@ -58,7 +57,7 @@ def caveindex(request): caves1626 = list(Cave.objects.filter(area__short_name = "1626")) caves1623.sort(caveCmp) caves1626.sort(caveCmp) - return render_with_context(request,'caveindex.html', {'caves1623': caves1623, 'caves1626': caves1626, 'notablecaves':notablecaves, 'cavepage': True}) + return render(request,'caveindex.html', {'caves1623': caves1623, 'caves1626': caves1626, 'notablecaves':notablecaves, 'cavepage': True}) def millenialcaves(request): #RW messing around area @@ -83,43 +82,43 @@ def cave3d(request, cave_id=''): def cave(request, cave_id='', offical_name=''): cave=getCave(cave_id) if cave.non_public and settings.PUBLIC_SITE and not request.user.is_authenticated(): - return render_with_context(request,'nonpublic.html', {'instance': cave, 'cavepage': True, 'cave_id': cave_id}) + return render(request,'nonpublic.html', {'instance': cave, 'cavepage': True, 'cave_id': cave_id}) else: - return render_with_context(request,'cave.html', {'settings': settings, 'cave': cave, 'cavepage': True, 'cave_id': cave_id}) + return render(request,'cave.html', {'settings': settings, 'cave': cave, 'cavepage': True, 'cave_id': cave_id}) def caveEntrance(request, slug): cave = Cave.objects.get(caveslug__slug = slug) if cave.non_public and settings.PUBLIC_SITE and not request.user.is_authenticated(): - return render_with_context(request,'nonpublic.html', {'instance': cave}) + return render(request,'nonpublic.html', {'instance': cave}) else: - return render_with_context(request,'cave_entrances.html', {'cave': cave}) + return render(request,'cave_entrances.html', {'cave': cave}) def caveDescription(request, slug): cave = Cave.objects.get(caveslug__slug = slug) if cave.non_public and settings.PUBLIC_SITE and not request.user.is_authenticated(): - return render_with_context(request,'nonpublic.html', {'instance': cave}) + return render(request,'nonpublic.html', {'instance': cave}) else: - return render_with_context(request,'cave_uground_description.html', {'cave': cave}) + return render(request,'cave_uground_description.html', {'cave': cave}) def caveQMs(request, slug): cave = Cave.objects.get(caveslug__slug = slug) if cave.non_public and settings.PUBLIC_SITE and not request.user.is_authenticated(): - return render_with_context(request,'nonpublic.html', {'instance': cave}) + return render(request,'nonpublic.html', {'instance': cave}) else: - return render_with_context(request,'cave_qms.html', {'cave': cave}) + return render(request,'cave_qms.html', {'cave': cave}) def caveLogbook(request, slug): cave = Cave.objects.get(caveslug__slug = slug) if cave.non_public and settings.PUBLIC_SITE and not request.user.is_authenticated(): - return render_with_context(request,'nonpublic.html', {'instance': cave}) + return render(request,'nonpublic.html', {'instance': cave}) else: - return render_with_context(request,'cave_logbook.html', {'cave': cave}) + return render(request,'cave_logbook.html', {'cave': cave}) def caveSlug(request, slug): cave = Cave.objects.get(caveslug__slug = slug) if cave.non_public and settings.PUBLIC_SITE and not request.user.is_authenticated(): - return render_with_context(request,'nonpublic.html', {'instance': cave, 'cave_editable': slug}) + return render(request,'nonpublic.html', {'instance': cave, 'cave_editable': slug}) else: - return render_with_context(request,'cave.html', {'cave': cave, 'cave_editable': slug}) + return render(request,'cave.html', {'cave': cave, 'cave_editable': slug}) @login_required_if_public def edit_cave(request, slug=None): @@ -160,7 +159,7 @@ def edit_cave(request, slug=None): ceFormSet = CaveAndEntranceFormSet(queryset=cave.caveandentrance_set.all()) versionControlForm = VersionControlCommentForm() - return render_with_context(request, + return render(request, 'editcave2.html', {'form': form, 'caveAndEntranceFormSet': ceFormSet, @@ -204,7 +203,7 @@ def editEntrance(request, caveslug, slug=None): entletter = EntranceLetterForm(request.POST) else: entletter = None - return render_with_context(request, + return render(request, 'editentrance.html', {'form': form, 'versionControlForm': versionControlForm, @@ -215,7 +214,7 @@ 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_with_context(request,'qm.html',locals()) + return render(request,'qm.html',locals()) except QM.DoesNotExist: url=urlparse.urljoin(settings.URL_ROOT, r'/admin/core/qm/add/'+'?'+ r'number=' + qm_id) @@ -228,16 +227,16 @@ 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_with_context(request,'entrance.html', {'cave': cave, + return render(request,'entrance.html', {'cave': cave, 'entrance': cave_and_ent.entrance, 'letter': cave_and_ent.entrance_letter,}) def entranceSlug(request, slug): entrance = Entrance.objects.get(entranceslug__slug = slug) if entrance.non_public and not request.user.is_authenticated(): - return render_with_context(request,'nonpublic.html', {'instance': entrance}) + return render(request,'nonpublic.html', {'instance': entrance}) else: - return render_with_context(request,'entranceslug.html', {'entrance': entrance}) + return render(request,'entranceslug.html', {'entrance': entrance}) def survexblock(request, survexpath): survexpath = re.sub("/", ".", survexpath) @@ -245,12 +244,12 @@ def survexblock(request, survexpath): survexblock = models.SurvexBlock.objects.get(survexpath=survexpath) #ftext = survexblock.filecontents() ftext = survexblock.text - return render_with_context(request,'survexblock.html', {'survexblock':survexblock, 'ftext':ftext, }) + return render(request,'survexblock.html', {'survexblock':survexblock, 'ftext':ftext, }) def surveyindex(request): surveys=Survey.objects.all() expeditions=Expedition.objects.order_by("-year") - return render_with_context(request,'survey.html',locals()) + return render(request,'survey.html',locals()) def survey(request,year,wallet_number): surveys=Survey.objects.all() @@ -263,19 +262,19 @@ def survey(request,year,wallet_number): planSketches=current_survey.scannedimage_set.filter(contents='plan') elevationSketches=current_survey.scannedimage_set.filter(contents='elevation') - return render_with_context(request,'survey.html', locals()) + return render(request,'survey.html', locals()) def cave_description(request, cavedescription_name): cave_description = get_object_or_404(CaveDescription, short_name = cavedescription_name) - return render_with_context(request,'cave_description.html', locals()) + return render(request,'cave_description.html', locals()) def get_entrances(request, caveslug): cave = Cave.objects.get(caveslug__slug = caveslug) - return render_with_context(request,'options.html', {"items": [(e.entrance.slug(), e.entrance.slug()) for e in cave.entrances()]}) + return render(request,'options.html', {"items": [(e.entrance.slug(), e.entrance.slug()) for e in cave.entrances()]}) def get_qms(request, caveslug): cave = Cave.objects.get(caveslug__slug = caveslug) - return render_with_context(request,'options.html', {"items": [(e.entrance.slug(), e.entrance.slug()) for e in cave.entrances()]}) + return render(request,'options.html', {"items": [(e.entrance.slug(), e.entrance.slug()) for e in cave.entrances()]}) areanames = [ #('', 'Location unclear'), @@ -313,7 +312,7 @@ def prospecting(request): caves = list(a.cave_set.all()) caves.sort(caveCmp) areas.append((name, a, caves)) - return render_with_context(request, 'prospecting.html', {"areas": areas}) + return render(request, 'prospecting.html', {"areas": areas}) # Parameters for big map and zoomed subarea maps: # big map first (zoom factor ignored) |