From 57eba77bdd64275a3bcd2950fe0c7ba13abcf776 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 8 Oct 2018 13:03:33 +0530 Subject: [PATCH 1/3] [Fix] User permissions --- frappe/permissions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/permissions.py b/frappe/permissions.py index 0878777c70..0c53722de1 100644 --- a/frappe/permissions.py +++ b/frappe/permissions.py @@ -179,7 +179,7 @@ def get_user_permissions(user): from frappe.core.doctype.user_permission.user_permission import get_user_permissions return get_user_permissions(user) -def has_user_permission(doc, user=None, verbose=False): +def has_user_permission(doc, user=None, verbose=True): '''Returns True if User is allowed to view considering User Permissions''' from frappe.core.doctype.user_permission.user_permission import get_user_permissions user_permissions = get_user_permissions(user) @@ -218,7 +218,7 @@ def has_user_permission(doc, user=None, verbose=False): if not d.get(field.fieldname) in user_permissions.get(field.options, {}).get("docs", []): if d.get('parentfield'): # "Not allowed for Company = Restricted Company in Row 3" - msg = _('Not allowed for {0} = {1} in Row {2}').format(_(field.options), d[field.fieldname], d.idx) + msg = _('Not allowed for {0} = {1} in Row {2}').format(_(field.options), d.get(field.fieldname), d.idx) else: # "Not allowed for Company = Restricted Company" msg = _('Not allowed for {0} = {1}').format(_(field.options), d.get(field.fieldname)) From ee0b116954ae5a663da7451e00a33a71835f5dbc Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 8 Oct 2018 13:06:19 +0530 Subject: [PATCH 2/3] fix(Text Editor): Clear editor when value is falsy --- frappe/public/js/frappe/form/controls/text_editor.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js index cba40706b1..0e00ae5294 100644 --- a/frappe/public/js/frappe/form/controls/text_editor.js +++ b/frappe/public/js/frappe/form/controls/text_editor.js @@ -102,8 +102,14 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({ }, set_formatted_input(value) { - if (!(this.quill && value)) return; + if (!this.quill) return; if (value === this.get_input_value()) return; + if (!value) { + // clear contents for falsy values like '', undefined or null + this.quill.setText(''); + return; + } + this.quill.setText(''); this.quill.clipboard.dangerouslyPasteHTML(0, value); }, From 1a601e8445141b01811d67409c8f35bc588e1ded Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Mon, 8 Oct 2018 09:41:29 +0000 Subject: [PATCH 3/3] bumped to version 11.0.3-beta.6 --- frappe/hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/hooks.py b/frappe/hooks.py index bfa706c0d7..ea851cd093 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe" app_license = "MIT" develop_version = '11.x.x-develop' -staging_version = '11.0.3-beta.5' +staging_version = '11.0.3-beta.6' app_email = "info@frappe.io"