From 7ccb5a21c42ad85d47790dfde7c0df0347256ea3 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 31 Jan 2019 09:31:19 +0530 Subject: [PATCH 1/3] fix: prepared report filters not working (#6864) --- frappe/desk/query_report.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index d33c341a9b..105be44dce 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -192,7 +192,9 @@ def run(report_name, filters=None, user=None): def get_prepared_report_result(report, filters, dn="", user=None): latest_report_data = {} # Only look for completed prepared reports with given filters. - doc_list = frappe.get_all("Prepared Report", filters={"status": "Completed", "report_name": report.name, "filters": json.dumps(filters), "owner": user}) + doc_list = frappe.get_all("Prepared Report", + filters={"status": "Completed", "report_name": report.name, "filters": filters, "owner": user}) + doc = None if len(doc_list): if dn: From 02664204aed5a8fc39df7045496f0403b4d4983e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 31 Jan 2019 13:17:22 +0530 Subject: [PATCH 2/3] fix: Set modified and created value while creating user permissions from patch (#6847) * Set modified and created value while creating user permissions * Add patch to set missing creation and modified value * Pass dict with value to the query * Fix query * Use now instead of now_datetime * Set actual creation and modified of user permission * Remove unwanted import * Remove bad, useless, garbage code --- frappe/patches.txt | 1 + frappe/patches/v11_0/remove_skip_for_doctype.py | 12 +++++++----- ...eation_and_modified_value_for_user_permissions.py | 6 ++++++ 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 frappe/patches/v11_0/set_missing_creation_and_modified_value_for_user_permissions.py diff --git a/frappe/patches.txt b/frappe/patches.txt index cc2dc8827b..ff4079afa1 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -234,3 +234,4 @@ frappe.patches.v11_0.migrate_report_settings_for_new_listview frappe.patches.v11_0.delete_all_prepared_reports frappe.patches.v11_0.fix_order_by_in_reports_json execute:frappe.delete_doc('Page', 'applications', ignore_missing=True) +frappe.patches.v11_0.set_missing_creation_and_modified_value_for_user_permissions \ No newline at end of file diff --git a/frappe/patches/v11_0/remove_skip_for_doctype.py b/frappe/patches/v11_0/remove_skip_for_doctype.py index c3b9ffff80..edd385e317 100644 --- a/frappe/patches/v11_0/remove_skip_for_doctype.py +++ b/frappe/patches/v11_0/remove_skip_for_doctype.py @@ -43,9 +43,9 @@ def execute(): # only specific doctypes are selected # split this into multiple records and delete linked_doctypes = get_linked_doctypes(user_permission.allow, True).keys() - + linked_doctypes = list(linked_doctypes) - + # append the doctype for which we have build the user permission linked_doctypes += [user_permission.allow] @@ -56,14 +56,16 @@ def execute(): user_permission.skip_for_doctype = None for doctype in applicable_for_doctypes: if doctype: - # Maintain sequence (name, user, allow, for_value, applicable_for, apply_to_all_doctypes) + # Maintain sequence (name, user, allow, for_value, applicable_for, apply_to_all_doctypes, creation, modified) new_user_permissions_list.append(( frappe.generate_hash("", 10), user_permission.user, user_permission.allow, user_permission.for_value, doctype, - 0 + 0, + user_permission.creation, + user_permission.modified )) else: # No skip_for_doctype found! Just update apply_to_all_doctypes. @@ -72,7 +74,7 @@ def execute(): if new_user_permissions_list: frappe.db.sql(''' INSERT INTO `tabUser Permission` - (`name`, `user`, `allow`, `for_value`, `applicable_for`, `apply_to_all_doctypes`) + (`name`, `user`, `allow`, `for_value`, `applicable_for`, `apply_to_all_doctypes`, `creation`, `modified`) VALUES {} '''.format( # nosec ', '.join(['%s'] * len(new_user_permissions_list)) diff --git a/frappe/patches/v11_0/set_missing_creation_and_modified_value_for_user_permissions.py b/frappe/patches/v11_0/set_missing_creation_and_modified_value_for_user_permissions.py new file mode 100644 index 0000000000..84d6d6c994 --- /dev/null +++ b/frappe/patches/v11_0/set_missing_creation_and_modified_value_for_user_permissions.py @@ -0,0 +1,6 @@ +import frappe + +def execute(): + frappe.db.sql('''UPDATE `tabUser Permission` + SET `modified`=NOW(), `creation`=NOW() + WHERE `creation` IS NULL''') \ No newline at end of file From f904987d2d93519cf896e26725cfc55c79dbb1fe Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Thu, 31 Jan 2019 13:48:38 +0550 Subject: [PATCH 3/3] bumped to version 11.1.3 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index a54412700d..666c51aea0 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -23,7 +23,7 @@ if sys.version[0] == '2': reload(sys) sys.setdefaultencoding("utf-8") -__version__ = '11.1.2' +__version__ = '11.1.3' __title__ = "Frappe Framework" local = Local()