Better error msgs for bad slugs

1 files changed, 7 insertions, 3 deletions

diff --git a/core/views/caves.py b/core/views/caves.py
index 305aabb..2ec7935 100644
--- a/core/views/caves.py
+++ b/core/views/caves.py
@@ -276,14 +276,18 @@ def cave(request, cave_id='', offical_name=''):
         caves = Cave.objects.filter(kataster_number=cave_id) 
         return render(request, 'svxcaveseveral.html', {'settings': settings, "caves":caves }) # not the right template, needs a specific one
     except ObjectDoesNotExist:
-        return render(request, 'svxcavesingle404.html', {'settings': settings, "cave":cave_id })
+        return render(request, 'errors/svxcavesingle404.html', {'settings': settings, "cave":cave_id })
     except:
-        return render(request, 'svxcavesingle404.html', {'settings': settings })
+        return render(request, 'errors/svxcavesingle404.html', {'settings': settings })
 
     return rendercave(request, cave, cave.slug(), cave_id=cave_id)
 
 def caveEntrance(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: