From 9a7a1728a44168e3d113edfa500893474343ec80 Mon Sep 17 00:00:00 2001 From: Rad Date: Thu, 28 Feb 2019 18:46:40 +0000 Subject: working maps: cave -> desc, survey -> cave, expedition -> person. Added /millnialpeople/ page. --- core/views_caves.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'core/views_caves.py') diff --git a/core/views_caves.py b/core/views_caves.py index 302003d..170ef17 100644 --- a/core/views_caves.py +++ b/core/views_caves.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from troggle.core.models import CaveSlug, Cave, CaveAndEntrance, Survey, Expedition, QM, CaveDescription, EntranceSlug, Entrance, Area, SurvexStation, CaveM, Cave_descriptionM +from troggle.core.models import CaveSlug, Cave, CaveAndEntrance, Survey, Expedition, QM, CaveDescription, EntranceSlug, Entrance, Area, SurvexStation from troggle.core.forms import CaveForm, CaveAndEntranceFormSet, VersionControlCommentForm, EntranceForm, EntranceLetterForm import troggle.core.models as models import troggle.settings as settings @@ -21,6 +21,13 @@ import settings from PIL import Image, ImageDraw, ImageFont import string, os, sys, subprocess +# +# NEW CONTENT +# + + +from troggle.core.models import CaveM, Cave_descriptionM, ExpeditionM + def millenialcaves(request): #RW messing around area caves = CaveM.objects.all() @@ -31,6 +38,16 @@ def millenialdescription(request, slug): desc = Cave_descriptionM.objects.get(slug=slug) return render_with_context(request,'cave_uground_description.html', {'cave': desc}) +def millenialpeople(request): + expos = ExpeditionM.objects.all() + return render_with_context(request,'peoplemillenial.html' , {'expos': expos}) + + +# +# END NEW CONTENT +# + + def getCave(cave_id): """Returns a cave object when given a cave name or number. It is used by views including cavehref, ent, and qm.""" -- cgit v1.2.3