Commit changes made on expo 2015

2 files changed, 7 insertions, 1 deletions

diff --git a/core/forms.py b/core/forms.py
index 75814ee..9d02066 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -29,6 +29,8 @@ class CaveForm(ModelForm):
             self._errors["official_name"] = self.error_class(["This field is required when there is a kataster number."]) 
         if self.cleaned_data.get("area") == []:
             self._errors["area"] = self.error_class(["This field is required."])
+        if self.cleaned_data.get("url").startswith("/"):
+            self._errors["url"] = self.error_class(["This field can not start with a /."])
         return self.cleaned_data
 
 class VersionControlCommentForm(forms.Form):
@@ -53,6 +55,10 @@ class EntranceForm(ModelForm):
     class Meta:
         model = Entrance
         exclude = ("cached_primary_slug", "filename",)
+    def clean(self):
+        if self.cleaned_data.get("url").startswith("/"):
+            self._errors["url"] = self.error_class(["This field can not start with a /."])
+        return self.cleaned_data
 
 
 
diff --git a/core/views_caves.py b/core/views_caves.py
index 511deb0..e3df0b3 100644
--- a/core/views_caves.py
+++ b/core/views_caves.py
@@ -63,7 +63,7 @@ def cave(request, cave_id='', offical_name=''):
     if cave.non_public and settings.PUBLIC_SITE and not request.user.is_authenticated():
         return render_with_context(request,'nonpublic.html', {'instance': cave, 'cavepage': True})
     else:
-        return render_with_context(request,'cave.html', {'cave': cave, 'cavepage': True})
+        return render_with_context(request,'cave.html', {'settings': settings, 'cave': cave, 'cavepage': True})
 
 def caveEntrance(request, slug):
     cave = Cave.objects.get(caveslug__slug = slug)