From 50414c0ffb9a67ff7bcf05cb4ddec019896ece98 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 26 Jul 2022 01:07:13 +0200 Subject: [PATCH 1/5] fix: pass doc to get_perm --- frappe/public/js/frappe/model/perm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/model/perm.js b/frappe/public/js/frappe/model/perm.js index 3ea9c6bc95..00640494ea 100644 --- a/frappe/public/js/frappe/model/perm.js +++ b/frappe/public/js/frappe/model/perm.js @@ -23,7 +23,7 @@ $.extend(frappe.perm, { has_perm: (doctype, permlevel, ptype, doc) => { if (!permlevel) permlevel = 0; if (!frappe.perm.doctype_perm[doctype]) { - frappe.perm.doctype_perm[doctype] = frappe.perm.get_perm(doctype); + frappe.perm.doctype_perm[doctype] = frappe.perm.get_perm(doctype, doc); } let perms = frappe.perm.doctype_perm[doctype]; From a560a7f7aaf2121c305bb8bdca68c8273151e590 Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Fri, 29 Jul 2022 13:03:12 +0200 Subject: [PATCH 2/5] fix: remove redundant lines --- frappe/public/js/frappe/model/perm.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/frappe/public/js/frappe/model/perm.js b/frappe/public/js/frappe/model/perm.js index 00640494ea..c6c94ce6c1 100644 --- a/frappe/public/js/frappe/model/perm.js +++ b/frappe/public/js/frappe/model/perm.js @@ -30,15 +30,7 @@ $.extend(frappe.perm, { if (!perms || !perms[permlevel]) return false; - let perm = !!perms[permlevel][ptype]; - - if (permlevel === 0 && perm && doc) { - let docinfo = frappe.model.get_docinfo(doctype, doc.name); - if (docinfo && !docinfo.permissions[ptype]) - perm = false; - } - - return perm; + return !!perms[permlevel][ptype]; }, get_perm: (doctype, doc) => { From ec2bcda44026637d39cd68a1068432f57559ba48 Mon Sep 17 00:00:00 2001 From: Ernesto Ruiz Date: Thu, 11 Aug 2022 01:40:30 -0600 Subject: [PATCH 3/5] feat: add button in calendar view list to show calendar (#17778) * feat: add button in calendar view list to show calendar * style: format JS * chore: linting Co-authored-by: gavin --- .../doctype/calendar_view/calendar_view_list.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 frappe/desk/doctype/calendar_view/calendar_view_list.js diff --git a/frappe/desk/doctype/calendar_view/calendar_view_list.js b/frappe/desk/doctype/calendar_view/calendar_view_list.js new file mode 100644 index 0000000000..aa55a8ebbb --- /dev/null +++ b/frappe/desk/doctype/calendar_view/calendar_view_list.js @@ -0,0 +1,16 @@ +frappe.listview_settings["Calendar View"] = { + button: { + show(doc) { + return doc.name; + }, + get_label() { + return frappe.utils.icon("calendar", "sm"); + }, + get_description(doc) { + return __("View {0}", [`${doc.name}`]); + }, + action(doc) { + frappe.set_route("List", doc.reference_doctype, "Calendar", doc.name); + }, + }, +}; From 3cf36c9616d87d04e435ef91744f900698d6be94 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Thu, 11 Aug 2022 13:13:57 +0530 Subject: [PATCH 4/5] ci: remove duplicate checks from mergify --- .mergify.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index d6a9272d5f..816ba3104d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -20,16 +20,6 @@ pull_request_rules: - name: Automatic merge on CI success and review conditions: - - status-success=Sider - - status-success=Check Commit Titles - - status-success=Python Unit Tests (MariaDB) (1) - - status-success=Python Unit Tests (MariaDB) (2) - - status-success=Python Unit Tests (Postgres) (1) - - status-success=Python Unit Tests (Postgres) (2) - - status-success=UI Tests (Cypress) (1) - - status-success=UI Tests (Cypress) (2) - - status-success=UI Tests (Cypress) (3) - - status-success=security/snyk (frappe) - label!=dont-merge - label!=squash - "#approved-reviews-by>=1" @@ -38,15 +28,6 @@ pull_request_rules: method: merge - name: Automatic squash on CI success and review conditions: - - status-success=Sider - - status-success=Python Unit Tests (MariaDB) (1) - - status-success=Python Unit Tests (MariaDB) (2) - - status-success=Python Unit Tests (Postgres) (1) - - status-success=Python Unit Tests (Postgres) (2) - - status-success=UI Tests (Cypress) (1) - - status-success=UI Tests (Cypress) (2) - - status-success=UI Tests (Cypress) (3) - - status-success=security/snyk (frappe) - label!=dont-merge - label=squash - "#approved-reviews-by>=1" From 395caebd5af4f41a64ffd74ea604ee975d0f16aa Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 11 Aug 2022 17:10:55 +0530 Subject: [PATCH 5/5] fix: init only existing single doctypes --- frappe/installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/installer.py b/frappe/installer.py index 32ab45e383..d7394ab3f2 100644 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -493,7 +493,7 @@ def init_singles(): doc.flags.ignore_mandatory = True doc.flags.ignore_validate = True doc.save() - except ImportError: + except (ImportError, frappe.DoesNotExistError): # The doctype exists, but controller is deleted, # no need to attempt to init such single, ref: #16917 continue