From 18a2ba7131b38b79656d9fe4bc532c50b1f488e3 Mon Sep 17 00:00:00 2001 From: ovresko <32199620+ovresko@users.noreply.github.com> Date: Tue, 12 Sep 2023 17:28:00 +0100 Subject: [PATCH 1/2] Update hd_ticket.py frappe.get_value does not guarantee returned fields order from database, we have situations where values are reversed between enable_restrictions and ignore_restrictions (one's take the other field value) `value = get_list( <============== IN FRAPPE THIS DOES NOT GUARANTEE FIELDS ORDER doctype, filters=filters, fields=fields, debug=debug, limit_page_length=1, parent=parent, as_dict=as_dict, ) if as_dict: return value[0] if value else {} if not value: return return value[0] if len(fields) > 1 else value[0][0] ` fixing by reading the result --- helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py index 4a5a91375..1c50cbb37 100644 --- a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py +++ b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py @@ -74,15 +74,19 @@ def get_list_filters(query: Query): ) query = query.where(Criterion.any(conditions)) - enable_restrictions, ignore_restrictions = frappe.get_value( + restricttions = frappe.get_value( doctype="HD Settings", fieldname=[ "restrict_tickets_by_agent_group", "do_not_restrict_tickets_without_an_agent_group", ], + as_dict=1 ) - enable_restrictions = bool(int(enable_restrictions)) - ignore_restrictions = bool(int(ignore_restrictions)) + enable_restrictions = ignore_restrictions = 0 + if restricttions: + enable_restrictions = bool(int(restricttions['restrict_tickets_by_agent_group'])) + ignore_restrictions = bool(int(restricttions['do_not_restrict_tickets_without_an_agent_group'])) + if not enable_restrictions: return query From f633ea1a75d9a5a24718cfa5fa95d040472abdea Mon Sep 17 00:00:00 2001 From: ovresko <32199620+ovresko@users.noreply.github.com> Date: Wed, 13 Dec 2023 13:39:22 +0100 Subject: [PATCH 2/2] Update hd_ticket.py Fix spelling "restrictions" --- helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py index 1c50cbb37..71c32390e 100644 --- a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py +++ b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py @@ -74,7 +74,7 @@ def get_list_filters(query: Query): ) query = query.where(Criterion.any(conditions)) - restricttions = frappe.get_value( + restrictions = frappe.get_value( doctype="HD Settings", fieldname=[ "restrict_tickets_by_agent_group", @@ -83,9 +83,9 @@ def get_list_filters(query: Query): as_dict=1 ) enable_restrictions = ignore_restrictions = 0 - if restricttions: - enable_restrictions = bool(int(restricttions['restrict_tickets_by_agent_group'])) - ignore_restrictions = bool(int(restricttions['do_not_restrict_tickets_without_an_agent_group'])) + if restrictions: + enable_restrictions = bool(int(restrictions['restrict_tickets_by_agent_group'])) + ignore_restrictions = bool(int(restrictions['do_not_restrict_tickets_without_an_agent_group'])) if not enable_restrictions: