diff --git a/helpdesk/views.py b/helpdesk/views.py index 36df6eab2..09ea5810f 100644 --- a/helpdesk/views.py +++ b/helpdesk/views.py @@ -482,7 +482,7 @@ def ticket_create(request): @login_required @hx_request_required -@owner_can_enter("perms.helpdesk.helpdesk_changeticket", Ticket) +@owner_can_enter(perm="helpdesk.change_ticket", model=Ticket) def ticket_update(request, ticket_id): """ This function is responsible for updating the Ticket. @@ -516,7 +516,7 @@ def ticket_update(request, ticket_id): @login_required -@permission_required("helpdesk_changeticket") +@permission_required("helpdesk.change_ticket") def ticket_archive(request, ticket_id): """ This function is responsible for archiving the Ticket. @@ -541,6 +541,7 @@ def ticket_archive(request, ticket_id): @login_required +@owner_can_enter(perm="helpdesk.change_ticket", model=Ticket) def change_ticket_status(request, ticket_id): """ This function is responsible for changing the Ticket status. @@ -560,7 +561,7 @@ def change_ticket_status(request, ticket_id): if ( user == ticket.employee_id or user in ticket.assigned_to.all() - or request.user.has_perm("helpdesk_changeticket") + or request.user.has_perm("helpdesk.change_ticket") ): ticket.status = status ticket.save() @@ -612,7 +613,7 @@ def change_ticket_status(request, ticket_id): @login_required -@owner_can_enter("perms.helpdesk.helpdesk_changeticket", Ticket) +@owner_can_enter(perm="helpdesk.change_ticket", model=Ticket) def ticket_delete(request, ticket_id): """ This function is responsible for deleting the Ticket. @@ -787,6 +788,7 @@ def ticket_filter(request): @login_required +@owner_can_enter(perm="helpdesk.change_ticket", model=Ticket) def ticket_detail(request, ticket_id, **kwargs): today = datetime.now().date() ticket = Ticket.objects.get(id=ticket_id) @@ -868,7 +870,7 @@ def ticket_update_tag(request): @login_required @hx_request_required -@owner_can_enter("perms.helpdesk.helpdesk_changeticket", Ticket) +@owner_can_enter(perm="helpdesk.change_ticket", model=Ticket) def ticket_change_raised_on(request, ticket_id): ticket = Ticket.objects.get(id=ticket_id) form = TicketRaisedOnForm(instance=ticket) @@ -887,7 +889,7 @@ def ticket_change_raised_on(request, ticket_id): @login_required @hx_request_required -@manager_can_enter("helpdesk_changeticket") +@manager_can_enter("helpdesk.change_ticket") def ticket_change_assignees(request, ticket_id): ticket = Ticket.objects.get(id=ticket_id) prev_assignee_ids = ticket.assigned_to.values_list("id", flat=True) @@ -1112,7 +1114,7 @@ def tickets_select_filter(request): @login_required -@permission_required("helpdesk_changeticket") +@permission_required("helpdesk.change_ticket") def tickets_bulk_archive(request): """ This is a ajax method used to archive bulk of Ticket instances