Merge branch 'master' into develop

This commit is contained in:
Nabin Hait 2018-03-28 08:43:50 +05:30
commit b455d90631
2 changed files with 12 additions and 1 deletions

View file

@ -15,7 +15,7 @@ from past.builtins import cmp
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
__version__ = '10.1.13'
__version__ = '10.1.14'
__title__ = "Frappe Framework"
local = Local()

View file

@ -28,6 +28,10 @@ def get_list(doctype, fields=None, filters=None, order_by=None,
:param order_by: Order by this fieldname
:param limit_start: Start at this index
:param limit_page_length: Number of records to be returned (default 20)'''
if frappe.is_table(doctype):
# not allowed for child tables!
raise frappe.PermissionError
return frappe.get_list(doctype, fields=fields, filters=filters, order_by=order_by,
limit_start=limit_start, limit_page_length=limit_page_length, ignore_permissions=False)
@ -38,6 +42,10 @@ def get(doctype, name=None, filters=None):
:param doctype: DocType of the document to be returned
:param name: return document of this `name`
:param filters: If name is not set, filter by these values and return the first match'''
if frappe.is_table(doctype):
# not allowed for child tables!
raise frappe.PermissionError
if filters and not name:
name = frappe.db.get_value(doctype, json.loads(filters))
if not name:
@ -56,6 +64,9 @@ def get_value(doctype, fieldname, filters=None, as_dict=True, debug=False):
:param doctype: DocType to be queried
:param fieldname: Field to be returned (default `name`)
:param filters: dict or string for identifying the record'''
if frappe.is_table(doctype):
# not allowed for child tables!
raise frappe.PermissionError
if not frappe.has_permission(doctype):
frappe.throw(_("No permission for {0}".format(doctype)), frappe.PermissionError)