diff options
| -rw-r--r-- | core/forms.py | 6 | ||||
| -rw-r--r-- | core/views_caves.py | 2 | ||||
| -rw-r--r-- | localsettingspotatohut.py | 9 |
3 files changed, 9 insertions, 8 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) diff --git a/localsettingspotatohut.py b/localsettingspotatohut.py index f1b6a3b..a9c39d5 100644 --- a/localsettingspotatohut.py +++ b/localsettingspotatohut.py @@ -15,10 +15,6 @@ DATABASES = { } } -EXPOUSER = 'expo' -EXPOUSERPASS = 'realpasshere' -EXPOUSER_EMAIL = 'wookey@wookware.org' - REPOS_ROOT_PATH = '/home/expo/' sys.path.append(REPOS_ROOT_PATH) sys.path.append(REPOS_ROOT_PATH + 'troggle') @@ -33,8 +29,8 @@ CAVERN = 'cavern' THREEDTOPOS = '3dtopos' EXPOWEB = REPOS_ROOT_PATH + 'expoweb/' SURVEYS = REPOS_ROOT_PATH -SURVEY_SCANS = REPOS_ROOT_PATH + 'expofiles/' -FILES = REPOS_ROOT_PATH + 'expofiles' +SURVEY_SCANS = REPOS_ROOT_PATH + 'expoimages/' +FILES = REPOS_ROOT_PATH + 'expoimages' PYTHON_PATH = '/home/expo/troggle/' @@ -49,7 +45,6 @@ MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/' MEDIA_ADMIN_DIR = '/usr/lib/python2.7/site-packages/django/contrib/admin/media/' JSLIB_PATH = '/usr/share/javascript/' -JSLIB_URL = URL_ROOT + 'javascript/' TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/' |