diff --git a/frappe/__init__.py b/frappe/__init__.py index 063af46d65..b04f9c7146 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -17,7 +17,7 @@ from faker import Faker from .exceptions import * from .utils.jinja import (get_jenv, get_template, render_template, get_email_from_template, get_jloader) -__version__ = '10.1.58' +__version__ = '10.1.59' __title__ = "Frappe Framework" local = Local() diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 150ce830b3..879fa92847 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -38,9 +38,10 @@ class File(NestedSet): self.set_folder_name() def get_name_based_on_parent_folder(self): - path = get_breadcrumbs(self.folder) - folder_name = frappe.get_value("File", self.folder, "file_name") - return "/".join([d.file_name for d in path] + [folder_name, self.file_name]) + if self.folder: + path = get_breadcrumbs(self.folder) + folder_name = frappe.get_value("File", self.folder, "file_name") + return "/".join([d.file_name for d in path] + [folder_name, self.file_name]) def autoname(self): """Set name for folder""" diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index cc50167273..0479692ff3 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -191,8 +191,7 @@ class DatabaseQuery(object): ''' sub_query_regex = re.compile("^.*[,();].*") - blacklisted_keywords = ['select', 'create', 'insert', 'delete', 'drop', 'update', 'case', - 'from', 'group', 'order', 'by'] + blacklisted_keywords = ['select', 'create', 'insert', 'delete', 'drop', 'update', 'case'] blacklisted_functions = ['concat', 'concat_ws', 'if', 'ifnull', 'nullif', 'coalesce', 'connection_id', 'current_user', 'database', 'last_insert_id', 'session_user', 'system_user', 'user', 'version'] @@ -659,6 +658,7 @@ def get_order_by(doctype, meta): def get_list(doctype, *args, **kwargs): '''wrapper for DatabaseQuery''' kwargs.pop('cmd', None) + kwargs.pop('ignore_permissions', None) return DatabaseQuery(doctype).execute(None, *args, **kwargs) def is_parent_only_filter(doctype, filters): diff --git a/frappe/model/meta.py b/frappe/model/meta.py index 7060e05124..7c09e3c531 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -365,7 +365,7 @@ class Meta(Document): def set_custom_permissions(self): '''Reset `permissions` with Custom DocPerm if exists''' - if frappe.flags.in_patch or frappe.flags.in_import or frappe.flags.in_install: + if frappe.flags.in_patch or frappe.flags.in_install: return if not self.istable and self.name not in ('DocType', 'DocField', 'DocPerm',