diff options
Diffstat (limited to 'core/views_logbooks.py')
| -rw-r--r-- | core/views_logbooks.py | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/core/views_logbooks.py b/core/views_logbooks.py index ffd1243..b8069da 100644 --- a/core/views_logbooks.py +++ b/core/views_logbooks.py @@ -1,4 +1,4 @@ -from django.shortcuts import render_to_response +from django.shortcuts import render_to_response, render from troggle.core.models import Expedition, Person, PersonExpedition, PersonTrip, LogbookEntry, SurvexBlock import troggle.core.models as models import troggle.settings as settings @@ -9,7 +9,6 @@ from troggle.core.forms import getTripForm#, get_name, PersonForm from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect, HttpResponse from django.template import Context, loader -from utils import render_with_context import os.path import troggle.parsers.logbooks as logbookparsers from django.template.defaultfilters import slugify @@ -55,7 +54,7 @@ def personindex(request): if person.bisnotable(): notablepersons.append(person) - return render_with_context(request,'personindex.html', {'persons': persons, 'personss':personss, 'notablepersons':notablepersons, }) + return render(request,'personindex.html', {'persons': persons, 'personss':personss, 'notablepersons':notablepersons, }) def expedition(request, expeditionname): @@ -77,7 +76,7 @@ def expedition(request, expeditionname): if "reload" in request.GET: LoadLogbookForExpedition(this_expedition) - return render_with_context(request,'expedition.html', {'expedition': this_expedition, 'expeditions':expeditions, 'personexpeditiondays':personexpeditiondays, 'settings':settings, 'dateditems': dateditems }) + return render(request,'expedition.html', {'expedition': this_expedition, 'expeditions':expeditions, 'personexpeditiondays':personexpeditiondays, 'settings':settings, 'dateditems': dateditems }) def get_absolute_url(self): return ('expedition', (expedition.year)) @@ -102,7 +101,7 @@ def person(request, first_name='', last_name='', ): this_person.save() return HttpResponseRedirect(reverse('profiles_select_profile')) - return render_with_context(request,'person.html', {'person': this_person, }) + return render(request,'person.html', {'person': this_person, }) def GetPersonChronology(personexpedition): @@ -135,17 +134,17 @@ def personexpedition(request, first_name='', last_name='', year=''): this_expedition = Expedition.objects.get(year=year) personexpedition = person.personexpedition_set.get(expedition=this_expedition) personchronology = GetPersonChronology(personexpedition) - return render_with_context(request,'personexpedition.html', {'personexpedition': personexpedition, 'personchronology':personchronology}) + return render(request,'personexpedition.html', {'personexpedition': personexpedition, 'personchronology':personchronology}) def logbookentry(request, date, slug): this_logbookentry = LogbookEntry.objects.filter(date=date, slug=slug) if len(this_logbookentry)>1: - return render_with_context(request, 'object_list.html',{'object_list':this_logbookentry}) + return render(request, 'object_list.html',{'object_list':this_logbookentry}) else: this_logbookentry=this_logbookentry[0] - return render_with_context(request, 'logbookentry.html', {'logbookentry': this_logbookentry}) + return render(request, 'logbookentry.html', {'logbookentry': this_logbookentry}) def logbookSearch(request, extra): @@ -156,14 +155,14 @@ def logbookSearch(request, extra): entry_query = search.get_query(query_string, ['text','title',]) found_entries = LogbookEntry.objects.filter(entry_query) - return render_with_context(request,'logbooksearch.html', + return render(request,'logbooksearch.html', { 'query_string': query_string, 'found_entries': found_entries, }) #context_instance=RequestContext(request)) def personForm(request,pk): person=Person.objects.get(pk=pk) form=PersonForm(instance=person) - return render_with_context(request,'personform.html', {'form':form,}) + return render(request,'personform.html', {'form':form,}) def experimental(request): @@ -180,7 +179,7 @@ def experimental(request): survexlegs = models.SurvexLeg.objects.all() totalsurvexlength = sum([survexleg.tape for survexleg in survexlegs]) - return render_with_context(request, 'experimental.html', { "nsurvexlegs":len(survexlegs), "totalsurvexlength":totalsurvexlength, "legsbyexpo":legsbyexpo }) + return render(request, 'experimental.html', { "nsurvexlegs":len(survexlegs), "totalsurvexlength":totalsurvexlength, "legsbyexpo":legsbyexpo }) @login_required_if_public def newLogbookEntry(request, expeditionyear, pdate = None, pslug = None): @@ -239,7 +238,7 @@ def newLogbookEntry(request, expeditionyear, pdate = None, pslug = None): tripForm = TripForm() # An unbound form personTripFormSet = PersonTripFormSet() - return render_with_context(request, 'newlogbookentry.html', { + return render(request, 'newlogbookentry.html', { 'tripForm': tripForm, 'personTripFormSet': personTripFormSet, @@ -261,8 +260,8 @@ def delLogbookEntry(lbe): def get_people(request, expeditionslug): exp = Expedition.objects.get(year = expeditionslug) - return render_with_context(request,'options.html', {"items": [(pe.slug, pe.name) for pe in exp.personexpedition_set.all()]}) + return render(request,'options.html', {"items": [(pe.slug, pe.name) for pe in exp.personexpedition_set.all()]}) def get_logbook_entries(request, expeditionslug): exp = Expedition.objects.get(year = expeditionslug) - return render_with_context(request,'options.html', {"items": [(le.slug, "%s - %s" % (le.date, le.title)) for le in exp.logbookentry_set.all()]}) + return render(request,'options.html', {"items": [(le.slug, "%s - %s" % (le.date, le.title)) for le in exp.logbookentry_set.all()]}) |