From 978e9fe656bb249237ba1ceea0ebec1aa0b06fa7 Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Fri, 7 Jul 2017 17:22:52 -0400 Subject: [PATCH] Fix inline discussions to use cached static assets. In production environments, the DiscussionXBlock was generating CSS and JS asset URLs that pointed to the unminified versions of those bundled assets. Due to our nginx rules, this would cause the assets to be served without the long expiration times, forcing the user's browser to constantly refetch these assets while browsing a course. [PERF-431] --- .../xblock_builtin/xblock_discussion/xblock_discussion.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py b/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py index 44341eef53..fb202556ee 100644 --- a/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py +++ b/openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py @@ -4,7 +4,7 @@ Discussion XBlock """ import logging -from django.templatetags.static import static +from django.contrib.staticfiles.storage import staticfiles_storage from django.utils.translation import get_language_bidi from xblockutils.resources import ResourceLoader @@ -136,14 +136,14 @@ class DiscussionXBlock(XBlock, StudioEditableXBlockMixin, XmlParserMixin): """ # Head dependencies for vendor_js_file in self.vendor_js_dependencies(): - fragment.add_resource_url(static(vendor_js_file), "application/javascript", "head") + fragment.add_resource_url(staticfiles_storage.url(vendor_js_file), "application/javascript", "head") for css_file in self.css_dependencies(): - fragment.add_css_url(static(css_file)) + fragment.add_css_url(staticfiles_storage.url(css_file)) # Body dependencies for js_file in self.js_dependencies(): - fragment.add_javascript_url(static(js_file)) + fragment.add_javascript_url(staticfiles_storage.url(js_file)) def has_permission(self, permission): """