dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow conditional templates, although no compilation, thanks Anthony

Browse Source
This commit is contained in:
mdipierro
2013-08-27 16:18:29 -05:00
parent 31c1e9468c
commit 202cad5424
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.08.27.16.11.32 Version 2.6.0-development+timestamp.2013.08.27.16.17.15
gluon/template.py
+6 -1
View File
@@ -434,6 +434,10 @@ class TemplateParser(object):
# Get the filename; filename looks like ``"template.html"``. # Get the filename; filename looks like ``"template.html"``.
# We need to eval to remove the quotes and get the string type. # We need to eval to remove the quotes and get the string type.
filename = eval(filename, context) filename = eval(filename, context)
# Allow empty filename for conditional extend and include directives.
if not filename:
return ''
# Get the path of the file on the system. # Get the path of the file on the system.
filepath = self.path and os.path.join(self.path, filename) or filename filepath = self.path and os.path.join(self.path, filename) or filename
@@ -468,7 +472,8 @@ class TemplateParser(object):
Extend ``filename``. Anything not declared in a block defined by the Extend ``filename``. Anything not declared in a block defined by the
parent will be placed in the parent templates ``{{include}}`` block. parent will be placed in the parent templates ``{{include}}`` block.
""" """
text = self._get_file_text(filename) # If no filename, create a dummy layout with only an {{include}}.
text = self._get_file_text(filename) or '%sinclude%s' % tuple(self.delimiters)
# Create out nodes list to send to the parent # Create out nodes list to send to the parent
super_nodes = [] super_nodes = []