Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1620 from MITx/fix/cdodge/static-url-allow-references-to-common

Browse Source 
need to support link references to static content that is in the code ba...
This commit is contained in:
Christina Roberts
2013-03-07 13:07:16 -08:00
parent 85d5264f5b 891bddcdf9
commit cb70a0f9d9
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/djangoapps/static_replace/__init__.py
View File

@@ -84,12 +84,15 @@ def replace_static_urls(text, data_directory, course_namespace=None):
if rest.endswith('?raw'):
return original
# course_namespace is not None, then use studio style urls
if course_namespace is not None and not isinstance(modulestore(), XMLModuleStore):
url = StaticContent.convert_legacy_static_url(rest, course_namespace)
# In debug mode, if we can find the url as is,
elif settings.DEBUG and finders.find(rest, True):
if settings.DEBUG and finders.find(rest, True):
return original
# course_namespace is not None, then use studio style urls
elif course_namespace is not None and not isinstance(modulestore(), XMLModuleStore):
if staticfiles_storage.exists(rest):
url = staticfiles_storage.url(rest)
else:
url = StaticContent.convert_legacy_static_url(rest, course_namespace)
# Otherwise, look the file up in staticfiles_storage, and append the data directory if needed
else:
course_path = "/".join((data_directory, rest))