summaryrefslogtreecommitdiffstats
path: root/flatpages
diff options
context:
space:
mode:
authorSam Wenham <sam@wenhams.co.uk>2018-04-15 16:28:13 +0100
committerSam Wenham <sam@wenhams.co.uk>2018-04-15 16:28:13 +0100
commit758259be4d63e2a3cf6e82e4a579ae836b36b931 (patch)
tree312e4a5dce84b3435c8ffa1799c38bd6bc4be2cc /flatpages
parent2c2c815b25a12adec18e424b288f6f5e3cda1226 (diff)
downloadtroggle-758259be4d63e2a3cf6e82e4a579ae836b36b931.tar.gz
troggle-758259be4d63e2a3cf6e82e4a579ae836b36b931.tar.bz2
troggle-758259be4d63e2a3cf6e82e4a579ae836b36b931.zip
Django 1.7 mostly working. Big refactor so probably bugs
Diffstat (limited to 'flatpages')
-rw-r--r--flatpages/models.py2
-rw-r--r--flatpages/views.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/flatpages/models.py b/flatpages/models.py
index 1c97851..7631881 100644
--- a/flatpages/models.py
+++ b/flatpages/models.py
@@ -1,5 +1,5 @@
from django.db import models
-from core.models import Cave, Entrance
+from troggle.core.models import Cave, Entrance
class Redirect(models.Model):
originalURL = models.CharField(max_length=200, unique=True)
diff --git a/flatpages/views.py b/flatpages/views.py
index 0b4a8a0..6503d40 100644
--- a/flatpages/views.py
+++ b/flatpages/views.py
@@ -75,7 +75,7 @@ def flatpage(request, path):
body.strip
return render_with_context(request, 'flatpage.html', {'editable': True, 'path': path, 'title': title, 'body': body, 'homepage': (path == "index.htm")})
else:
- return HttpResponse(o.read(), mimetype=getmimetype(path))
+ return HttpResponse(o.read(), content_type=getmimetype(path))
def getmimetype(path):
if path.lower().endswith(".png"): return "image/png"