diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2019-07-29 11:36:24 +0100 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2019-07-29 11:36:24 +0100 |
| commit | c74852b60ba954661b92aae98b79f62d6cb9a4d7 (patch) | |
| tree | fbc02a56f24a8f75aaeed2dce90029b2e0e61123 /flatpages/views.py | |
| parent | 2d7892e3b16841e494d43c5e0b25fbe599af777d (diff) | |
| parent | a26109cb3006dd64e1bec38100397ad636813e98 (diff) | |
| download | troggle-c74852b60ba954661b92aae98b79f62d6cb9a4d7.tar.gz troggle-c74852b60ba954661b92aae98b79f62d6cb9a4d7.tar.bz2 troggle-c74852b60ba954661b92aae98b79f62d6cb9a4d7.zip | |
Merge branch 'master' of ssh://expo.survex.com/~/troggle
# Conflicts:
# README.txt
Diffstat (limited to 'flatpages/views.py')
| -rw-r--r-- | flatpages/views.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/flatpages/views.py b/flatpages/views.py index 6360393..6ef2404 100644 --- a/flatpages/views.py +++ b/flatpages/views.py @@ -38,7 +38,7 @@ def flatpage(request, path): print("flat path noinfo", path) return HttpResponseRedirect(reverse("auth_login") + '?next=%s' % request.path) - if path.endswith("/") or path == "": + if path.endswith("/") or path == "": try: o = open(os.path.normpath(settings.EXPOWEB + path + "index.html"), "rb") path = path + "index.html" @@ -165,4 +165,4 @@ def editflatpage(request, path): class FlatPageForm(forms.Form): title = forms.CharField(widget=forms.TextInput(attrs={'size':'60'})) - html = forms.CharField(widget=forms.Textarea()) + html = forms.CharField(widget=TinyMCE(attrs={'cols': 80, 'rows': 20})) |