From 90da644834ce2e25512f18dc77449ff01a6cc4c1 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 19 Aug 2020 12:48:38 +0530 Subject: [PATCH 1/3] fix: add parrenttype in query --- frappe/core/doctype/doctype/doctype.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 7f84555b79..5c558f3bd6 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -989,7 +989,8 @@ def clear_permissions_cache(doctype): `tabHas Role`, `tabDocPerm` WHERE `tabDocPerm`.`parent` = %s - AND `tabDocPerm`.`role` = `tabHas Role`.`role` + AND `tabDocPerm`.`role` = `tabHas Role`.`role` + AND `tabHas Role`.`parenttype` = 'User' """, doctype): frappe.clear_cache(user=user) From 2655a3f8dc5846a83de9316c8a4deb9f47f0f217 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 19 Aug 2020 12:49:40 +0530 Subject: [PATCH 2/3] feat: freeze dom on updating permissions --- frappe/core/page/permission_manager/permission_manager.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/core/page/permission_manager/permission_manager.js b/frappe/core/page/permission_manager/permission_manager.js index 3f5d7c0a7b..7608b25766 100644 --- a/frappe/core/page/permission_manager/permission_manager.js +++ b/frappe/core/page/permission_manager/permission_manager.js @@ -334,6 +334,7 @@ frappe.PermissionEngine = Class.extend({ }); this.body.on("click", "input[type='checkbox']", function() { + frappe.dom.freeze(); var chk = $(this); var args = { role: chk.attr("data-role"), @@ -348,6 +349,7 @@ frappe.PermissionEngine = Class.extend({ method: "update", args: args, callback: function(r) { + frappe.dom.unfreeze(); if(r.exc) { // exception: reverse chk.prop("checked", !chk.prop("checked")); From 65165b6be636b3360d361f926e864a84c2fd907f Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 24 Aug 2020 13:09:20 +0530 Subject: [PATCH 3/3] fix: translation syntax --- frappe/core/page/permission_manager/permission_manager.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/core/page/permission_manager/permission_manager.js b/frappe/core/page/permission_manager/permission_manager.js index 7608b25766..0d3267c7d5 100644 --- a/frappe/core/page/permission_manager/permission_manager.js +++ b/frappe/core/page/permission_manager/permission_manager.js @@ -376,8 +376,7 @@ frappe.PermissionEngine = Class.extend({ options:me.options.roles, reqd:1,fieldname:"role"}, {fieldtype:"Select", label:__("Permission Level"), options:[0,1,2,3,4,5,6,7,8,9], reqd:1, fieldname: "permlevel", - description: __("Level 0 is for document level permissions, \ - higher levels for field level permissions.")} + description: __("Level 0 is for document level permissions, higher levels for field level permissions.")} ] }); if(me.get_doctype()) {