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

Merge branch 'staging-fixes' into staging

Browse source
This commit is contained in:
Ameya Shenoy 2018-10-08 09:41:29 +00:00
commit c4f1cdd502
No known key found for this signature in database
GPG key ID: AC016A555657D0A3
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/hooks.py
View file

@ -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"

4
frappe/permissions.py
View file

@ -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))

8
frappe/public/js/frappe/form/controls/text_editor.js
View file

@ -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);
},