From 43313bca74ac8dc8396e194998e7f13151df3138 Mon Sep 17 00:00:00 2001 From: Horilla Date: Tue, 9 Jan 2024 15:57:59 +0530 Subject: [PATCH] [FIX] HELPDESK: Helpdesk department manager permission issye --- .../helpdesk/ticket/ticket_list.html | 4 ++-- helpdesk/views.py | 20 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/helpdesk/templates/helpdesk/ticket/ticket_list.html b/helpdesk/templates/helpdesk/ticket/ticket_list.html index a9e490cef..e2c965ec8 100644 --- a/helpdesk/templates/helpdesk/ticket/ticket_list.html +++ b/helpdesk/templates/helpdesk/ticket/ticket_list.html @@ -305,9 +305,9 @@
- {% if ticket.assigned_to.all request.user.employee_get == ticket.employee_id %} + {% if ticket.assigned_to.all or request.user.employee_get == ticket.employee_id %} diff --git a/helpdesk/views.py b/helpdesk/views.py index 17490b9a3..4c9b01958 100644 --- a/helpdesk/views.py +++ b/helpdesk/views.py @@ -414,8 +414,9 @@ def ticket_create(request): assignees = [employee.employee_user_id for employee in employees] assignees.append(ticket.employee_id.employee_user_id) if hasattr(ticket.get_raised_on_object(), 'dept_manager'): - manager = ticket.get_raised_on_object().dept_manager.all().first().manager - assignees.append(manager.employee_user_id) + if ticket.get_raised_on_object().dept_manager.all(): + manager = ticket.get_raised_on_object().dept_manager.all().first().manager + assignees.append(manager.employee_user_id) notify.send( request.user.employee_get, recipient=assignees, @@ -526,8 +527,9 @@ def change_ticket_status(request,ticket_id): assignees = [employee.employee_user_id for employee in employees] assignees.append(ticket.employee_id.employee_user_id) if hasattr(ticket.get_raised_on_object(), 'dept_manager'): - manager = ticket.get_raised_on_object().dept_manager.all().first().manager - assignees.append(manager.employee_user_id) + if ticket.get_raised_on_object().dept_manager.all(): + manager = ticket.get_raised_on_object().dept_manager.all().first().manager + assignees.append(manager.employee_user_id) notify.send( request.user.employee_get, recipient=assignees, @@ -574,8 +576,9 @@ def ticket_delete(request, ticket_id): assignees = [employee.employee_user_id for employee in employees] assignees.append(ticket.employee_id.employee_user_id) if hasattr(ticket.get_raised_on_object(), 'dept_manager'): - manager = ticket.get_raised_on_object().dept_manager.all().first().manager - assignees.append(manager.employee_user_id) + if ticket.get_raised_on_object().dept_manager.all(): + manager = ticket.get_raised_on_object().dept_manager.all().first().manager + assignees.append(manager.employee_user_id) notify.send( request.user.employee_get, recipient=assignees, @@ -997,8 +1000,9 @@ def tickets_bulk_delete(request): assignees = [employee.employee_user_id for employee in employees] assignees.append(ticket.employee_id.employee_user_id) if hasattr(ticket.get_raised_on_object(), 'dept_manager'): - manager = ticket.get_raised_on_object().dept_manager.all().first().manager - assignees.append(manager.employee_user_id) + if ticket.get_raised_on_object().dept_manager.all(): + manager = ticket.get_raised_on_object().dept_manager.all().first().manager + assignees.append(manager.employee_user_id) notify.send( request.user.employee_get, recipient=assignees,