From 3fab1def959ad674eff2d7ab7dfe8fe447a7eac3 Mon Sep 17 00:00:00 2001
From: Christopher Broderick <uhurusurfa@gmail.com>
Date: Thu, 6 Mar 2025 02:37:53 +0000
Subject: [PATCH] Fix setting the unassigned (-1) option as selected

---
 helpdesk/templates/helpdesk/filters/kbitems.html | 2 +-
 helpdesk/templates/helpdesk/filters/owner.html   | 2 +-
 helpdesk/templates/helpdesk/filters/queue.html   | 5 +++++
 helpdesk/templates/helpdesk/filters/status.html  | 9 ++++++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/helpdesk/templates/helpdesk/filters/kbitems.html b/helpdesk/templates/helpdesk/filters/kbitems.html
index 17cab5f7..87316fea 100644
--- a/helpdesk/templates/helpdesk/filters/kbitems.html
+++ b/helpdesk/templates/helpdesk/filters/kbitems.html
@@ -8,7 +8,7 @@
     <div class="col col-sm-3">
         <select id='id_kbitems' name='kbitem' multiple='selected' size='5'>
             {% with magic_number=-1 %}
-            <option value='{{magic_number}}'{% if magic_number|in_list:query_params.filtering.kbitem__in %} selected='selected'{% endif %}>
+            <option value='{{magic_number}}'{% if query_params.filtering_null.kbitem__isnull %} selected='selected'{% endif %}>
                 {% trans "Uncategorized" %}
             </option>
             {% endwith %}
diff --git a/helpdesk/templates/helpdesk/filters/owner.html b/helpdesk/templates/helpdesk/filters/owner.html
index 87e5bfad..6e1335e7 100644
--- a/helpdesk/templates/helpdesk/filters/owner.html
+++ b/helpdesk/templates/helpdesk/filters/owner.html
@@ -8,7 +8,7 @@
     <div class="col col-sm-3">
         <select id='id_owners' name='assigned_to' multiple='selected' size='5'>
             {% with magic_number=-1 %}
-            <option value='{{magic_number}}'{% if magic_number|in_list:query_params.filtering.assigned_to__id__in %} selected='selected'{% endif %}>
+            <option value='{{magic_number}}'{% if query_params.filtering_null.assigned_to__id__isnull %} selected='selected'{% endif %}>
                 {% trans "Unassigned" %}
             </option>
             {% endwith %}
diff --git a/helpdesk/templates/helpdesk/filters/queue.html b/helpdesk/templates/helpdesk/filters/queue.html
index dd66d53d..4f3b3334 100644
--- a/helpdesk/templates/helpdesk/filters/queue.html
+++ b/helpdesk/templates/helpdesk/filters/queue.html
@@ -7,6 +7,11 @@
     </div>
     <div class="col col-sm-3">
         <select id='id_queues' name='queue' multiple='selected' size='5'>
+          {% with magic_number=-1 %}
+            <option value='{{magic_number}}'{% if query_params.filtering_null.queue__id__isnull %} selected='selected'{% endif %}>
+                {% trans "Unassigned" %}
+            </option>
+          {% endwith %}
           {% for q in queue_choices %}
             <option value='{{ q.id }}'{% if q.id|in_list:query_params.filtering.queue__id__in %} selected="selected"{% endif %}>{{ q.title }}</option>
             {% endfor %}
diff --git a/helpdesk/templates/helpdesk/filters/status.html b/helpdesk/templates/helpdesk/filters/status.html
index 8c2ce03f..26cfd2c8 100644
--- a/helpdesk/templates/helpdesk/filters/status.html
+++ b/helpdesk/templates/helpdesk/filters/status.html
@@ -6,7 +6,14 @@
             <label for='id_statuses'>{% trans "Status(es)" %}:</label>
     </div>
     <div class="col col-sm-3">
-            <select id='id_statuses' name='status' multiple='selected' size='5'>{% for s in status_choices %}<option value='{{ s.0 }}'{% if s.0|in_list:query_params.filtering.status__in %} selected='selected'{% endif %}>{{ s.1 }}</option>{% endfor %}</select>
+            <select id='id_statuses' name='status' multiple='selected' size='5'>
+            {% with magic_number=-1 %}
+            <option value='{{magic_number}}'{% if query_params.filtering_null.status__isnull %} selected='selected'{% endif %}>
+                {% trans "Unassigned" %}
+            </option>
+            {% endwith %}
+
+            {% for s in status_choices %}<option value='{{ s.0 }}'{% if s.0|in_list:query_params.filtering.status__in %} selected='selected'{% endif %}>{{ s.1 }}</option>{% endfor %}</select>
     </div>
   <div class="col col-sm-6">
     <button class="filterBuilderRemove btn btn-danger btn-sm float-right"><i class="fas fa-trash-alt"></i></button>