diff --git a/CHANGELOG.md b/CHANGELOG.md index cec7a44e74..a759684fd4 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Enhancements - NOTICKET - update changelog, post-release ### Fixed bugs +- GP2-2890 - DAC NonText Content 01 - GP2-2835 - Disable caching on homepage - GP2-2889 - DAC Decorative_Images_01 - clear alt tags on decorative images - GP2-2888 - DAC Dialog_01 - aria-modal on confirmation dialogues. diff --git a/config/settings.py b/config/settings.py index 1b54346cbe..8094f14154 100644 --- a/config/settings.py +++ b/config/settings.py @@ -79,7 +79,6 @@ ] MIDDLEWARE = [ - 'wagtailcache.cache.UpdateCacheMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', @@ -93,7 +92,6 @@ 'core.middleware.UserSpecificRedirectMiddleware', 'core.middleware.UserLocationStoreMiddleware', 'core.middleware.StoreUserExpertiseMiddleware', - 'wagtailcache.cache.FetchFromCacheMiddleware', 'core.middleware.CheckGATags', ] diff --git a/domestic/models.py b/domestic/models.py index 2dde09529a..6647dc6c20 100644 --- a/domestic/models.py +++ b/domestic/models.py @@ -16,7 +16,6 @@ from wagtail.core.models import Page from wagtail.images import get_image_model_string from wagtail.images.edit_handlers import ImageChooserPanel -from wagtailcache.cache import WagtailCacheMixin from core import ( blocks as core_blocks, @@ -136,7 +135,6 @@ class DomesticHomePage( mixins.EnableTourMixin, mixins.AnonymousUserRequired, DataLayerMixin, - WagtailCacheMixin, Page, ): # Note that this is was the original homepage for Magna/V2 MPV. @@ -163,10 +161,6 @@ class DomesticHomePage( ImageChooserPanel('image'), ] - # Deliberately asking wagtail not to cache homepage - def cache_control(self): - return 'no-cache' - class DomesticDashboard( mixins.WagtailAdminExclusivePageMixin, diff --git a/exportplan/templates/exportplan/dashboard_page.html b/exportplan/templates/exportplan/dashboard_page.html index 6249ac1abc..41dfc4b2b8 100644 --- a/exportplan/templates/exportplan/dashboard_page.html +++ b/exportplan/templates/exportplan/dashboard_page.html @@ -53,7 +53,7 @@