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

Revert "Allow theme template block override"

Browse Source
This commit is contained in:
Jesse Zoldak
2017-11-29 13:24:36 -05:00
committed by Matt Tuchfarber
parent 989c3a30d7
commit 9c49c10b27
3 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/djangoapps/edxmako/paths.py
View File

@@ -70,11 +70,6 @@ class DynamicTemplateLookup(TemplateLookup):
try:
# Try to find themed template, i.e. see if current theme overrides the template
template = super(DynamicTemplateLookup, self).get_template(get_template_path_with_theme(uri))
# For an overriding template, the uri is the path to the same template, so the lookup always
# finds the same overriding template. If that's the case, route to exception so that the
# uri can be stripped of the path and the parent template can be found.
if template == super(DynamicTemplateLookup, self).get_template(uri):
raise TopLevelLookupException()
except TopLevelLookupException:
# strip off the prefix path to theme and look in default template dirs
template = super(DynamicTemplateLookup, self).get_template(strip_site_theme_templates_path(uri))