From 7bde45ae600aef54df473aa653b2046ea31d3e31 Mon Sep 17 00:00:00 2001 From: PeterG Date: Sun, 20 Nov 2022 10:13:34 +0000 Subject: [PATCH 1/7] [fix] clearer webform error --- frappe/website/doctype/web_form/web_form.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index 03ba7c0880..cbd65e8822 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -577,6 +577,9 @@ def get_link_options(web_form_name, doctype, allow_read_on_all_link_options=Fals if not allow_read_on_all_link_options: limited_to_user = True + else: + print(vars(frappe.request)) + frappe.throw("You must be logged in to use this form.", frappe.PermissionError) else: for field in web_form_doc.web_form_fields: @@ -607,4 +610,4 @@ def get_link_options(web_form_name, doctype, allow_read_on_all_link_options=Fals return "\n".join([doc.value for doc in link_options]) else: - raise frappe.PermissionError(f"Not Allowed, {doctype}") + raise frappe.PermissionError(f"You don't have permission to access the {doctype} DocType.") From 4ffd454c0437d5f0546ccef71fe2bd5b85b17518 Mon Sep 17 00:00:00 2001 From: PeterG Date: Sun, 20 Nov 2022 16:07:07 +0545 Subject: [PATCH 2/7] [fix] clearer webform error --- frappe/website/doctype/web_form/web_form.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index cbd65e8822..c674fa4cd2 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -578,7 +578,6 @@ def get_link_options(web_form_name, doctype, allow_read_on_all_link_options=Fals if not allow_read_on_all_link_options: limited_to_user = True else: - print(vars(frappe.request)) frappe.throw("You must be logged in to use this form.", frappe.PermissionError) else: From 8cbfc36f656c75e642db4217070a0631ea2686e0 Mon Sep 17 00:00:00 2001 From: PeterG Date: Mon, 21 Nov 2022 14:28:03 +0545 Subject: [PATCH 3/7] fix: update-password api call (#18943) [skip ci] --- frappe/www/update-password.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html index 04dfa5e097..586554efce 100644 --- a/frappe/www/update-password.html +++ b/frappe/www/update-password.html @@ -161,7 +161,7 @@ frappe.ready(function() { .text("{{ _('Invalid Password') }}"); }, 200: function(r) { - if (r.message && r.message.entropy) { + if (r.message && r.message.score) { var score = r.message.score, feedback = r.message.feedback; From 264c9dfad045771bd457cb5a638232826a397df3 Mon Sep 17 00:00:00 2001 From: PeterG Date: Mon, 21 Nov 2022 15:06:06 +0545 Subject: [PATCH 4/7] Update frappe/website/doctype/web_form/web_form.py Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> --- frappe/website/doctype/web_form/web_form.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index c674fa4cd2..7ff707618a 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -609,4 +609,4 @@ def get_link_options(web_form_name, doctype, allow_read_on_all_link_options=Fals return "\n".join([doc.value for doc in link_options]) else: - raise frappe.PermissionError(f"You don't have permission to access the {doctype} DocType.") + raise frappe.PermissionError(_("You don't have permission to access the {0} DocType.").format(doctype)) From cfa9ed4fa0a26dcd14a580c5c3814dac6c4a11fd Mon Sep 17 00:00:00 2001 From: PeterG Date: Mon, 21 Nov 2022 15:06:17 +0545 Subject: [PATCH 5/7] Update frappe/website/doctype/web_form/web_form.py Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> --- frappe/website/doctype/web_form/web_form.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index 7ff707618a..2bfa7e7133 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -578,7 +578,7 @@ def get_link_options(web_form_name, doctype, allow_read_on_all_link_options=Fals if not allow_read_on_all_link_options: limited_to_user = True else: - frappe.throw("You must be logged in to use this form.", frappe.PermissionError) + frappe.throw(_("You must be logged in to use this form."), frappe.PermissionError) else: for field in web_form_doc.web_form_fields: From e594c35a3adefd4e94887785316f1b9ca9cc2036 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 21 Nov 2022 14:47:05 +0530 Subject: [PATCH 6/7] fix: show fields without labels in print format builder (#18939) * fix: show fields without labels in print format builder * refactor: dont hardcode layout fields [skip ci] Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> --- .../page/print_format_builder/print_format_builder.js | 5 +---- .../print_format_builder/print_format_builder_field.html | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/frappe/printing/page/print_format_builder/print_format_builder.js b/frappe/printing/page/print_format_builder/print_format_builder.js index 4154861f84..657904f32e 100644 --- a/frappe/printing/page/print_format_builder/print_format_builder.js +++ b/frappe/printing/page/print_format_builder/print_format_builder.js @@ -280,10 +280,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder { set_section(f.label); } else if (f.fieldtype === "Column Break") { set_column(); - } else if ( - !in_list(["Section Break", "Column Break", "Tab Break", "Fold"], f.fieldtype) && - f.label - ) { + } else if (!in_list(frappe.model.layout_fields, f.fieldtype)) { if (!column) set_column(); if (f.fieldtype === "Table") { diff --git a/frappe/printing/page/print_format_builder/print_format_builder_field.html b/frappe/printing/page/print_format_builder/print_format_builder_field.html index beb9de2f5a..90eb4f1f0a 100644 --- a/frappe/printing/page/print_format_builder/print_format_builder_field.html +++ b/frappe/printing/page/print_format_builder/print_format_builder_field.html @@ -34,7 +34,7 @@ - {{ __(field.label) }} + {{ __(field.label) || __(field.fieldname) }} ({%= __("Table") %}) From 4ec7d2dbbab91eaafd95cd03245b073053755d51 Mon Sep 17 00:00:00 2001 From: PeterG Date: Mon, 21 Nov 2022 15:11:18 +0545 Subject: [PATCH 7/7] feat(minor): redirect after login from NotPermittedPage (#18946) * redirect after login from NotPermittedPage --- frappe/website/page_renderers/not_permitted_page.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/website/page_renderers/not_permitted_page.py b/frappe/website/page_renderers/not_permitted_page.py index bd27150617..68d4efa939 100644 --- a/frappe/website/page_renderers/not_permitted_page.py +++ b/frappe/website/page_renderers/not_permitted_page.py @@ -14,9 +14,10 @@ class NotPermittedPage(TemplatePage): return True def render(self): + action = f"/login?redirect-to={frappe.request.path}" frappe.local.message_title = _("Not Permitted") frappe.local.response["context"] = dict( - indicator_color="red", primary_action="/login", primary_label=_("Login"), fullpage=True + indicator_color="red", primary_action=action, primary_label=_("Login"), fullpage=True ) self.set_standard_path("message") return super().render()