Merge branch 'main' into fix/store/rm_user

frappe · Sep 26, 2023 · e9e943b · e9e943b
2 parents 1dca3af + ee7bc61
commit e9e943b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json
@@ -368,7 +368,7 @@
  "icon": "fa fa-issue",
  "idx": 61,
  "links": [],
- "modified": "2023-09-27 02:51:13.078952",
+ "modified": "2023-09-27 03:20:19.360900",
  "modified_by": "Administrator",
  "module": "Helpdesk",
  "name": "HD Ticket",
@@ -401,16 +401,14 @@
   },
   {
    "create": 1,
-   "delete": 1,
    "email": 1,
    "export": 1,
    "if_owner": 1,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "All",
-   "share": 1,
-   "write": 1
+   "share": 1
   }
  ],
  "quick_entry": 1,
@@ -424,4 +422,4 @@
  "title_field": "subject",
  "track_changes": 1,
  "track_seen": 1
-}
+}
diff --git a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
@@ -148,6 +148,16 @@ def by_priority(query: Query, direction: Order):
 			"Last modified on": "modified",
 		}
 
+	def has_permission(self, perm):
+		has_standard_permissions = super().has_permission(perm)
+		user = frappe.session.user
+		customer = get_customer(user)
+		is_customer = self.customer == customer
+		is_contact = self.contact == user
+		is_raised = self.raised_by == user
+		has_extra_permissions = is_customer or is_contact or is_raised
+		return has_standard_permissions or has_extra_permissions
+
 	def publish_update(self):
 		publish_event("helpdesk:ticket-update", {"name": self.name})
 		capture_event("ticket_updated")