Commit f928d4a3 by Calen Pennington

Only munge /static/ urls in module html to point to course static files if they…

Only munge /static/ urls in module html to point to course static files if they don't exist in the global static locations
parent 21e3cc1c
...@@ -9,8 +9,11 @@ def replace(static_url, prefix=None): ...@@ -9,8 +9,11 @@ def replace(static_url, prefix=None):
prefix = prefix + '/' prefix = prefix + '/'
quote = static_url.group('quote') quote = static_url.group('quote')
url = staticfiles_storage.url(prefix + static_url.group('rest')) if staticfiles_storage.exists(static_url.group('rest')):
return "".join([quote, url, quote]) return static_url.group(0)
else:
url = staticfiles_storage.url(prefix + static_url.group('rest'))
return "".join([quote, url, quote])
def replace_urls(text, staticfiles_prefix=None, replace_prefix='/static/'): def replace_urls(text, staticfiles_prefix=None, replace_prefix='/static/'):
...@@ -18,9 +21,9 @@ def replace_urls(text, staticfiles_prefix=None, replace_prefix='/static/'): ...@@ -18,9 +21,9 @@ def replace_urls(text, staticfiles_prefix=None, replace_prefix='/static/'):
return replace(static_url, staticfiles_prefix) return replace(static_url, staticfiles_prefix)
return re.sub(r""" return re.sub(r"""
(?x) # flags=re.VERBOSE (?x) # flags=re.VERBOSE
(?P<quote>\\?['"]) # the opening quotes (?P<quote>\\?['"]) # the opening quotes
{prefix} # the prefix (?P<prefix>{prefix}) # the prefix
(?P<rest>.*?) # everything else in the url (?P<rest>.*?) # everything else in the url
(?P=quote) # the first matching closing quote (?P=quote) # the first matching closing quote
""".format(prefix=replace_prefix), replace_url, text) """.format(prefix=replace_prefix), replace_url, text)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment