From 61aa477cbf3b70e67c1a694c57ef9ede7b3babe0 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Sat, 22 Mar 2025 20:49:37 -0400
Subject: [PATCH] Fix Tags

---
 contacts.php    | 4 ++--
 credentials.php | 6 +++---
 locations.php   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/contacts.php b/contacts.php
index 05cb817c..44d3a5cf 100644
--- a/contacts.php
+++ b/contacts.php
@@ -120,9 +120,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 LEFT JOIN contact_tags ON contact_tags.tag_id = tags.tag_id
                                 LEFT JOIN contacts ON contact_tags.contact_id = contacts.contact_id
                                 WHERE tag_type = 3
-                                $client_query OR tags.tag_id IN ($tag_filter) -- This ensures we only get tags relevant to the selected client or Include the tags in the URL, even if no contacts are associated with them
+                                $client_query OR tags.tag_id IN ($tag_filter)
                                 GROUP BY tags.tag_id
-                                HAVING COUNT(contact_tags.contact_id) > 0
+                                HAVING COUNT(contact_tags.contact_id) > 0 OR tags.tag_id IN ($tag_filter)
                             ");
                             while ($row = mysqli_fetch_array($sql_tags_filter)) {
                                 $tag_id = intval($row['tag_id']);
diff --git a/credentials.php b/credentials.php
index 5cd23caf..9f2d82b3 100644
--- a/credentials.php
+++ b/credentials.php
@@ -129,14 +129,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
                             $sql_tags_filter = mysqli_query($mysqli, "
-                                SELECT tags.tag_id, tags.tag_name, tag_type 
+                                SELECT tags.tag_id, tags.tag_name
                                 FROM tags 
                                 LEFT JOIN credential_tags ON credential_tags.tag_id = tags.tag_id
                                 LEFT JOIN credentials ON credential_tags.credential_id = credentials.credential_id
                                 WHERE tag_type = 4
-                                $client_query OR tags.tag_id IN ($tag_filter) -- This ensures we only get tags relevant to the selected client or Include the tags in the URL, even if no contacts are associated with them
+                                $client_query OR tags.tag_id IN ($tag_filter)
                                 GROUP BY tags.tag_id
-                                HAVING COUNT(credential_tags.credential_id) > 0
+                                HAVING COUNT(credential_tags.credential_id) > 0 OR tags.tag_id IN ($tag_filter)
                             ");
                             while ($row = mysqli_fetch_array($sql_tags_filter)) {
                                 $tag_id = intval($row['tag_id']);
diff --git a/locations.php b/locations.php
index 2e63daaf..a6f9d1df 100644
--- a/locations.php
+++ b/locations.php
@@ -108,9 +108,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 LEFT JOIN location_tags ON location_tags.tag_id = tags.tag_id
                                 LEFT JOIN locations ON location_tags.location_id = locations.location_id
                                 WHERE tag_type = 2
-                                $client_query OR tags.tag_id IN ($tag_filter) -- This ensures we only get tags relevant to the selected client or Include the tags in the URL, even if no contacts are associated with them
+                                $client_query OR tags.tag_id IN ($tag_filter)
                                 GROUP BY tags.tag_id
-                                HAVING COUNT(location_tags.location_id) > 0
+                                HAVING COUNT(location_tags.location_id) > 0 OR tags.tag_id IN ($tag_filter)
                             ");
                             while ($row = mysqli_fetch_array($sql_tags_filter)) {
                                 $tag_id = intval($row['tag_id']);