vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor: render web_template in python

Browse source 
... instead of in jinja. (For better debugging.)
This commit is contained in:
barredterra 2020-09-21 16:53:47 +02:00
parent 1f833da6be
commit 4dc140a3ea
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/templates/includes/web_block.html
View file

@ -7,19 +7,19 @@
web_block.css_class
]) -%}
{%- if web_template.type == 'Section' -%}
{%- if web_template_type == 'Section' -%}
{%- if not web_block.hide_block -%}
<section class="section {{ classes }}" data-section-idx="{{ web_block.idx | e }}"
data-section-template="{{ web_block.web_template | e }}">
{%- if web_block.add_container -%}
<div class="container">
{%- endif -%}
{{ web_template.render(web_block.web_template_values) }}
{{ web_template_html }}
{%- if web_block.add_container -%}
</div>
{%- endif -%}
</section>
{%- endif -%}
{%- else -%}
{{ web_template.render(web_block.web_template_values) }}
{{ web_template_html }}
{%- endif -%}

7
frappe/website/doctype/web_page/web_page.py
View file

@ -209,8 +209,11 @@ def get_web_blocks_html(blocks):
extracted_styles = []
for block in blocks:
web_template = frappe.get_cached_doc('Web Template', block.web_template)
rendered_html = frappe.render_template('templates/includes/web_block.html',
context={'web_block': block, 'web_template': web_template})
rendered_html = frappe.render_template('templates/includes/web_block.html', context={
'web_block': block,
'web_template_html': web_template.render(block.web_template_values),
'web_template_type': web_template.type
})
html, scripts, styles = extract_script_and_style_tags(rendered_html)
out.html += html
if block.web_template not in extracted_scripts: