xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

fix tests to match new error messages

Browse Source
This commit is contained in:
Philip Sargent
2021-12-05 21:45:06 +00:00
parent b3aa99f008
commit 406b4590a9
4 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/views/caves.py
View File

@@ -294,14 +294,22 @@ def caveEntrance(request, slug):
return render(request,'cave_entrances.html', {'cave': cave})
def caveDescription(request, slug):
cave = Cave.objects.get(caveslug__slug = slug)
try:
cave = Cave.objects.get(caveslug__slug = slug)
except:
return render(request,'errors/badslug.html', {'badslug': slug})
if cave.non_public and settings.PUBLIC_SITE and not request.user.is_authenticated:
return render(request,'nonpublic.html', {'instance': cave})
else:
return render(request,'cave_uground_description.html', {'cave': cave})
def caveQMs(request, slug):
cave = Cave.objects.get(caveslug__slug = slug)
try:
cave = Cave.objects.get(caveslug__slug = slug)
except:
return render(request,'errors/badslug.html', {'badslug': slug})
if cave.non_public and settings.PUBLIC_SITE and not request.user.is_authenticated:
return render(request,'nonpublic.html', {'instance': cave})
else:
@@ -316,7 +324,10 @@ def edit_cave(request, slug=None):
'''
message = ""
if slug is not None:
cave = Cave.objects.get(caveslug__slug = slug)
try:
cave = Cave.objects.get(caveslug__slug = slug)
except:
return render(request,'errors/badslug.html', {'badslug': slug})
else:
cave = Cave()
if request.POST:
@@ -375,7 +386,10 @@ def edit_entrance(request, caveslug=None, slug=None):
'''
message = ""
if caveslug is not None:
cave = Cave.objects.get(caveslug__slug = caveslug)
try:
cave = Cave.objects.get(caveslug__slug = caveslug)
except:
return render(request,'errors/badslug.html', {'badslug': caveslug})
else:
cave = Cave()
if slug is not None:
@@ -460,9 +474,15 @@ def surveyindex(request):
return render(request,'survey.html',locals())
def get_entrances(request, caveslug):
cave = Cave.objects.get(caveslug__slug = caveslug)
try:
cave = Cave.objects.get(caveslug__slug = caveslug)
except:
return render(request,'errors/badslug.html', {'badslug': caveslug})
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)
try:
cave = Cave.objects.get(caveslug__slug = caveslug)
except:
return render(request,'errors/badslug.html', {'badslug': caveslug})
return render(request,'options.html', {"items": [(e.entrance.slug(), e.entrance.slug()) for e in cave.entrances()]})