Merge branch 'develop' into release/2.7

Princeton-CDH · Sep 16, 2020 · 6e5ca9c · 6e5ca9c
2 parents c1c3492 + 4f53e77
commit 6e5ca9c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/cdhweb/settings.py b/cdhweb/settings.py
@@ -257,8 +257,12 @@
         "DIRS": [
             os.path.join(PROJECT_ROOT, "templates")
         ],
-        "APP_DIRS": True,
         "OPTIONS": {
+            'loaders': [
+                'apptemplates.Loader',
+                'django.template.loaders.filesystem.Loader',
+                'django.template.loaders.app_directories.Loader',
+            ],
             "context_processors": [
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",

diff --git a/requirements/prod.txt b/requirements/prod.txt
@@ -15,3 +15,4 @@ python-dateutil
 icalendar
 attrdict
 django-fullurl
+django-apptemplates
diff --git a/templates/pages/richtextpage.html b/templates/pages/richtextpage.html
@@ -1,4 +1,4 @@
-{% extends "pages/richtextpage.html" %}
+{% extends "pages:pages/richtextpage.html" %}
 
 {% block bodyattrs %}class="richtextpage{% if not page.published %} draft{% endif %}"{% endblock %}