Unified Diff: cms/converters.py
Issue 29328184:
Issue 3092 - Support use of Jinja2 template inheritance (Closed)
Patch Set:
Created Sept. 18, 2015, 11:06 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« README.md ('k')
|
cms/utils.py » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: cms/converters.py |
| diff --git a/cms/converters.py b/cms/converters.py |
| index 0ad557f94a56c721fa160eddb2ca12eb5ed056b6..c1fd6138d18be9532a86d876cbec5074162bd01f 100644 |
| --- a/cms/converters.py |
| +++ b/cms/converters.py |
| @@ -270,7 +270,7 @@ class Converter: |
| def __call__(self): |
| result = self.get_html(*self._params[self._key]) |
| result = self.resolve_includes(result) |
| - if self._key == "pagedata": |
| + if self._key == "pagedata" and not self._params["jinja2_inheritence"]: |
|
Wladimir Palant
2015/09/18 13:44:54
Nit: it's inheritance, not inheritence
|
| head = [] |
| def add_to_head(match): |
| head.append(match.group(1)) |
« no previous file with comments
|
« README.md ('k')
|
cms/utils.py » ('j')
|
no next file with comments »
