From a507de886316462dc15dd6f85bc268052fe18a0f Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Fri, 2 Oct 2020 17:01:58 +0200 Subject: [PATCH 1/5] fix: allow empty type for Web Templates that are not sections --- frappe/website/doctype/web_template/web_template.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/web_template/web_template.json b/frappe/website/doctype/web_template/web_template.json index fed7008cdb..492c265e55 100644 --- a/frappe/website/doctype/web_template/web_template.json +++ b/frappe/website/doctype/web_template/web_template.json @@ -41,7 +41,7 @@ "in_list_view": 1, "in_standard_filter": 1, "label": "Type", - "options": "Section\nNavbar\nFooter" + "options": "\nSection\nNavbar\nFooter" }, { "depends_on": "standard", @@ -58,7 +58,7 @@ "link_fieldname": "web_template" } ], - "modified": "2020-09-25 00:48:57.902292", + "modified": "2020-10-02 17:00:52.512209", "modified_by": "Administrator", "module": "Website", "name": "Web Template", From dc98dba97f7f9f5f97e50e7d57c4975e90a242a7 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 19 Oct 2020 14:48:49 +0200 Subject: [PATCH 2/5] fix: "Component" istead of empty type --- frappe/website/doctype/web_template/web_template.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/web_template/web_template.json b/frappe/website/doctype/web_template/web_template.json index 492c265e55..2728f5a1a7 100644 --- a/frappe/website/doctype/web_template/web_template.json +++ b/frappe/website/doctype/web_template/web_template.json @@ -41,7 +41,7 @@ "in_list_view": 1, "in_standard_filter": 1, "label": "Type", - "options": "\nSection\nNavbar\nFooter" + "options": "Component\nSection\nNavbar\nFooter" }, { "depends_on": "standard", @@ -58,7 +58,7 @@ "link_fieldname": "web_template" } ], - "modified": "2020-10-02 17:00:52.512209", + "modified": "2020-10-19 14:44:16.694730", "modified_by": "Administrator", "module": "Website", "name": "Web Template", From aba8bf28bc7727e9b0f5f8b76a7c8c11c2d2dfd2 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 19 Oct 2020 15:52:01 +0200 Subject: [PATCH 3/5] feat: set filter on Web Page Blocks Component is not allowed as a page section, only as part of another Web Template. --- frappe/website/doctype/web_page/web_page.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/frappe/website/doctype/web_page/web_page.js b/frappe/website/doctype/web_page/web_page.js index ab4f534c61..78b42856c9 100644 --- a/frappe/website/doctype/web_page/web_page.js +++ b/frappe/website/doctype/web_page/web_page.js @@ -19,6 +19,9 @@ frappe.ui.form.on('Web Page', { insert_code: function(frm) { frm.events.layout(frm); }, + onload: function(frm) { + frm.trigger('set_filters_on_web_page_blocks'); + }, refresh: function(frm) { if (frm.doc.template_path) { frm.set_read_only(); @@ -40,7 +43,20 @@ frappe.ui.form.on('Web Page', { frm.set_value('end_date', end_date); } }, - + content_type: function(frm) { + frm.trigger('set_filters_on_web_page_blocks'); + }, + set_filters_on_web_page_blocks: function(frm) { + if (frm.doc.content_type === 'Page Builder') { + frm.set_query('web_template', 'page_blocks', function() { + return { + "filters": { + "type": ['!=', 'Component'] + } + }; + }); + } + }, set_meta_tags(frm) { frappe.utils.set_meta_tag(frm.doc.route); } From 5d3178ed19b075d7fbb73fbf4a395274f7b79c71 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 20 Oct 2020 14:53:23 +0200 Subject: [PATCH 4/5] fix: disable padding and container by default --- frappe/utils/jinja.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py index 6eb9d98971..7fc8f48173 100644 --- a/frappe/utils/jinja.py +++ b/frappe/utils/jinja.py @@ -212,9 +212,9 @@ def web_blocks(blocks): 'doctype': 'Web Page Block', 'web_template': block['template'], 'web_template_values': block.get('values', {}), - 'add_top_padding': 1, - 'add_bottom_padding': 1, - 'add_container': 1, + 'add_top_padding': 0, + 'add_bottom_padding': 0, + 'add_container': 0, 'hide_block': 0, 'css_class': '' }) From e90faf76b59a84e9cdecd37c64df4112e1f84956 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 22 Oct 2020 17:43:31 +0530 Subject: [PATCH 5/5] fix: Remove unnecessary code - Extra spacing is only applied to templates of type Section - should be able to call web_block without values - default type should be Section - set_query can be set once --- frappe/utils/jinja.py | 8 +++---- frappe/website/doctype/web_page/web_page.js | 22 ++++++------------- .../doctype/web_template/web_template.json | 3 ++- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py index 7fc8f48173..cd74b2a283 100644 --- a/frappe/utils/jinja.py +++ b/frappe/utils/jinja.py @@ -193,7 +193,7 @@ def inspect(var, render=True): return get_jenv().from_string(html).render(context) -def web_block(template, values, **kwargs): +def web_block(template, values=None, **kwargs): options = {"template": template, "values": values} options.update(kwargs) return web_blocks([options]) @@ -212,9 +212,9 @@ def web_blocks(blocks): 'doctype': 'Web Page Block', 'web_template': block['template'], 'web_template_values': block.get('values', {}), - 'add_top_padding': 0, - 'add_bottom_padding': 0, - 'add_container': 0, + 'add_top_padding': 1, + 'add_bottom_padding': 1, + 'add_container': 1, 'hide_block': 0, 'css_class': '' }) diff --git a/frappe/website/doctype/web_page/web_page.js b/frappe/website/doctype/web_page/web_page.js index 78b42856c9..a58c854e5c 100644 --- a/frappe/website/doctype/web_page/web_page.js +++ b/frappe/website/doctype/web_page/web_page.js @@ -20,7 +20,13 @@ frappe.ui.form.on('Web Page', { frm.events.layout(frm); }, onload: function(frm) { - frm.trigger('set_filters_on_web_page_blocks'); + frm.set_query('web_template', 'page_blocks', function() { + return { + filters: { + "type": 'Section' + } + }; + }); }, refresh: function(frm) { if (frm.doc.template_path) { @@ -43,20 +49,6 @@ frappe.ui.form.on('Web Page', { frm.set_value('end_date', end_date); } }, - content_type: function(frm) { - frm.trigger('set_filters_on_web_page_blocks'); - }, - set_filters_on_web_page_blocks: function(frm) { - if (frm.doc.content_type === 'Page Builder') { - frm.set_query('web_template', 'page_blocks', function() { - return { - "filters": { - "type": ['!=', 'Component'] - } - }; - }); - } - }, set_meta_tags(frm) { frappe.utils.set_meta_tag(frm.doc.route); } diff --git a/frappe/website/doctype/web_template/web_template.json b/frappe/website/doctype/web_template/web_template.json index 2728f5a1a7..b3b9114c6b 100644 --- a/frappe/website/doctype/web_template/web_template.json +++ b/frappe/website/doctype/web_template/web_template.json @@ -36,6 +36,7 @@ "label": "Standard" }, { + "default": "Section", "fieldname": "type", "fieldtype": "Select", "in_list_view": 1, @@ -58,7 +59,7 @@ "link_fieldname": "web_template" } ], - "modified": "2020-10-19 14:44:16.694730", + "modified": "2020-10-22 17:36:45.042517", "modified_by": "Administrator", "module": "Website", "name": "Web Template",