From 2915d7a1b7e2d49b541f2f122c9a5f96fdddadd6 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 16 Aug 2023 14:07:25 -0400 Subject: [PATCH] Replicated reworked tags code logic under client details and ticket details --- inc_all_client.php | 7 +++++-- ticket.php | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/inc_all_client.php b/inc_all_client.php index fdb247af..438e892b 100644 --- a/inc_all_client.php +++ b/inc_all_client.php @@ -56,7 +56,7 @@ if (isset($_GET['client_id'])) { $location_phone = formatPhoneNumber($row['location_phone']); $location_primary = intval($row['location_primary']); - //Client Tags + // Client Tags $client_tag_name_display_array = array(); $client_tag_id_array = array(); @@ -66,13 +66,16 @@ if (isset($_GET['client_id'])) { $client_tag_id = intval($row['tag_id']); $client_tag_name = nullable_htmlentities($row['tag_name']); $client_tag_color = nullable_htmlentities($row['tag_color']); + if (empty($client_tag_color)) { + $client_tag_color = "dark"; + } $client_tag_icon = nullable_htmlentities($row['tag_icon']); if (empty($client_tag_icon)) { $client_tag_icon = "tag"; } $client_tag_id_array[] = $client_tag_id; - $client_tag_name_display_array[] = "$client_tag_name "; + $client_tag_name_display_array[] = "$client_tag_name "; } $client_tags_display = " " . implode('', $client_tag_name_display_array); diff --git a/ticket.php b/ticket.php index 3f985442..957ef0e4 100644 --- a/ticket.php +++ b/ticket.php @@ -141,7 +141,8 @@ if (isset($_GET['ticket_id'])) { $row = mysqli_fetch_array($ticket_total_reply_time); $ticket_total_reply_time = nullable_htmlentities($row['ticket_total_reply_time']); - //Client Tags + // Client Tags + $client_tag_name_display_array = array(); $client_tag_id_array = array(); $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.client_tag_tag_id = tags.tag_id WHERE client_tags.client_tag_client_id = $client_id"); @@ -150,13 +151,16 @@ if (isset($_GET['ticket_id'])) { $client_tag_id = intval($row['tag_id']); $client_tag_name = nullable_htmlentities($row['tag_name']); $client_tag_color = nullable_htmlentities($row['tag_color']); + if (empty($client_tag_color)) { + $client_tag_color = "dark"; + } $client_tag_icon = nullable_htmlentities($row['tag_icon']); if (empty($client_tag_icon)) { $client_tag_icon = "tag"; } $client_tag_id_array[] = $client_tag_id; - $client_tag_name_display_array[] = " $client_tag_name"; + $client_tag_name_display_array[] = "$client_tag_name "; } $client_tags_display = implode(' ', $client_tag_name_display_array);