From 4aa8b9ba63d92c9446d28dedd91284f083f09df3 Mon Sep 17 00:00:00 2001 From: Kanchan Chauhan Date: Fri, 8 Apr 2016 23:24:29 +0530 Subject: [PATCH 1/3] Web form perm fix --- frappe/website/doctype/web_form/web_form.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index 4de03911d5..7cc9e11311 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -250,9 +250,18 @@ def has_web_form_permission(doctype, name, ptype='read'): elif frappe.has_website_permission(doctype, ptype=ptype, doc=name): return True + + elif check_webform_perm(doctype, name): + return True else: return False + +def check_webform_perm(doctype, name): + doc = frappe.get_doc(doctype, name) + if hasattr(doc, "has_webform_permission"): + if doc.has_webform_permission(): + return True def get_web_form_list(doctype, txt, filters, limit_start, limit_page_length=20): from frappe.templates.pages.list import get_list From d08b66b66e01ef5fb8ee33d59b747c3649fb550c Mon Sep 17 00:00:00 2001 From: Kanchan Chauhan Date: Mon, 11 Apr 2016 22:15:07 +0530 Subject: [PATCH 2/3] Indents fixed --- frappe/website/doctype/web_form/web_form.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index 7cc9e11311..99549a0a27 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -254,6 +254,9 @@ def has_web_form_permission(doctype, name, ptype='read'): elif check_webform_perm(doctype, name): return True + elif check_webform_perm(doctype, name): + return True + else: return False @@ -263,6 +266,12 @@ def check_webform_perm(doctype, name): if doc.has_webform_permission(): return True +def check_webform_perm(doctype, name): + doc = frappe.get_doc(doctype, name) + if hasattr(doc, "has_webform_permission"): + if doc.has_webform_permission(): + return True + def get_web_form_list(doctype, txt, filters, limit_start, limit_page_length=20): from frappe.templates.pages.list import get_list if not filters: From 00f05fefdcebb9d19800c5ae7996668cb1d34038 Mon Sep 17 00:00:00 2001 From: Kanchan Chauhan Date: Mon, 11 Apr 2016 22:17:07 +0530 Subject: [PATCH 3/3] Indents fixed --- frappe/website/doctype/web_form/web_form.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index 99549a0a27..65da5cde32 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -250,21 +250,13 @@ def has_web_form_permission(doctype, name, ptype='read'): elif frappe.has_website_permission(doctype, ptype=ptype, doc=name): return True - - elif check_webform_perm(doctype, name): - return True elif check_webform_perm(doctype, name): return True else: return False - -def check_webform_perm(doctype, name): - doc = frappe.get_doc(doctype, name) - if hasattr(doc, "has_webform_permission"): - if doc.has_webform_permission(): - return True + def check_webform_perm(doctype, name): doc = frappe.get_doc(doctype, name)