diff options
author | Sam Wenham <sam@wenhams.co.uk> | 2019-07-19 01:04:18 +0100 |
---|---|---|
committer | Sam Wenham <sam@wenhams.co.uk> | 2019-07-19 01:04:18 +0100 |
commit | de22b071b0749fef13ea3c53faaed1adb3191356 (patch) | |
tree | fc66284dca70014ee395f6a14f4972ef8addc3e3 /core/views_caves.py | |
parent | 08a41941f9e2b35b16548624d5070216dd933f79 (diff) | |
download | troggle-de22b071b0749fef13ea3c53faaed1adb3191356.tar.gz troggle-de22b071b0749fef13ea3c53faaed1adb3191356.tar.bz2 troggle-de22b071b0749fef13ea3c53faaed1adb3191356.zip |
Improve README
Make new style QMs from survexfiles work
Diffstat (limited to 'core/views_caves.py')
-rw-r--r-- | core/views_caves.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/views_caves.py b/core/views_caves.py index 7b0555f..6dab34a 100644 --- a/core/views_caves.py +++ b/core/views_caves.py @@ -50,7 +50,7 @@ def caveCmp(x, y): return numericalcmp(x.unofficial_number, y.unofficial_number) def caveindex(request): - caves = Cave.objects.all() + #caves = Cave.objects.all() notablecavehrefs = settings.NOTABLECAVESHREFS notablecaves = [Cave.objects.get(kataster_number=kataster_number) for kataster_number in notablecavehrefs ] caves1623 = list(Cave.objects.filter(area__short_name = "1623")) @@ -106,6 +106,7 @@ def caveQMs(request, slug): return render(request,'nonpublic.html', {'instance': cave}) else: 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(): @@ -210,10 +211,9 @@ def editEntrance(request, caveslug, slug=None): 'entletter': entletter }) -def qm(request,cave_id,qm_id,year,grade=None): - year=int(year) +def qm(request,qm_id): try: - qm=getCave(cave_id).get_QMs().get(number=qm_id,found_by__date__year=year) + qm=QM.objects.get(id=qm_id) return render(request,'qm.html',locals()) except QM.DoesNotExist: |