From 68fd56770d71d17a9f21d7d0b1a4a10f7fdb1aa9 Mon Sep 17 00:00:00 2001
From: Gabriel Adamson <adamson.g@gmail.com>
Date: Fri, 12 Nov 2021 01:59:42 -0600
Subject: [PATCH] Fixes bug in admin ticket panel

---
 tgui/packages/tgui/interfaces/TicketListPanel.js   | 4 ++--
 yogstation/code/modules/admin/verbs/ticketpanel.dm | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tgui/packages/tgui/interfaces/TicketListPanel.js b/tgui/packages/tgui/interfaces/TicketListPanel.js
index f4b933de5c32..770cc556c803 100644
--- a/tgui/packages/tgui/interfaces/TicketListPanel.js
+++ b/tgui/packages/tgui/interfaces/TicketListPanel.js
@@ -173,7 +173,7 @@ export const TicketSummary = (props, context) => {
       <Button
         icon="reply"
         onClick={() => act('reply', {
-          'id': ticket.id,
+          'index': ticket.index,
         })}>
         {ticket.initiator_key_name}
       </Button><br />
@@ -190,7 +190,7 @@ export const TicketSummary = (props, context) => {
                   disabled={button.disabled}
                   selected={button.selected}
                   onClick={(val => () => act(val, {
-                    'id': ticket.id,
+                    'index': ticket.index,
                   }))(button.act)}>
                   {button.name}
                 </Button>
diff --git a/yogstation/code/modules/admin/verbs/ticketpanel.dm b/yogstation/code/modules/admin/verbs/ticketpanel.dm
index bce00360671c..4987959ad56a 100644
--- a/yogstation/code/modules/admin/verbs/ticketpanel.dm
+++ b/yogstation/code/modules/admin/verbs/ticketpanel.dm
@@ -15,10 +15,14 @@ GLOBAL_VAR_INIT(experimental_adminpanel, TRUE)
 	.["resolved_tickets"] = list()
 	.["user_key"] = user.key
 
-	for(var/datum/admin_help/ahelp as anything in GLOB.ahelp_tickets.tickets_list)
+	for(var/i in 1 to tickets_list.len)
+		var/datum/admin_help/ahelp = tickets_list[i]
+		if(!istype(ahelp)) return
+
 		var/ticket_data = list()
 		ticket_data["name"] = ahelp.name
 		ticket_data["id"] = ahelp.id
+		ticket_data["index"] = i
 		ticket_data["initiator_key_name"] = ahelp.initiator_key_name
 		ticket_data["initiator_ckey"] = ahelp.initiator_ckey
 		ticket_data["admin_key"] = ahelp.handling_admin && ahelp.handling_admin.key
@@ -36,7 +40,7 @@ GLOBAL_VAR_INIT(experimental_adminpanel, TRUE)
 	. = ..()
 	if(.)
 		return
-	var/datum/admin_help/ticket = tickets_list[params["id"]]
+	var/datum/admin_help/ticket = tickets_list[params["index"]]
 	if(!ticket)
 		return FALSE