From d2945c9cac00dc651238b4ba1b0547d00776bbcf Mon Sep 17 00:00:00 2001
From: Arthur Hanson <worldnomad@gmail.com>
Date: Tue, 9 Jul 2024 14:37:18 +0700
Subject: [PATCH] 14731 sort / status

---
 netbox/core/views.py                   |  4 +++
 netbox/templates/core/plugin_list.html | 42 +++++++++-----------------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/netbox/core/views.py b/netbox/core/views.py
index 2e8ae27a9..2e336d134 100644
--- a/netbox/core/views.py
+++ b/netbox/core/views.py
@@ -806,6 +806,10 @@ class PluginListView(UserPassesTestMixin, View):
 
         return render(request, 'core/plugin_list.html', {
             'plugins': plugins,
+            'sort_choices': dict(PluginSortChoices),
+            'status_choices': dict(PluginStatusChoices),
+            'sort': sort,
+            'status': status,
         })
 
 
diff --git a/netbox/templates/core/plugin_list.html b/netbox/templates/core/plugin_list.html
index 384a28e63..1b7d39b72 100644
--- a/netbox/templates/core/plugin_list.html
+++ b/netbox/templates/core/plugin_list.html
@@ -39,17 +39,15 @@
               {% trans "Status" %}
               <div class="dropdown">
                 <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-                  {% trans "Status" %}
+                  {{ status_choices|get_key:status }}
                 </button>
                 <div class="dropdown-menu">
-                  <a class="dropdown-item d-flex justify-content-between" href="{% url 'core:plugin_list' %}?status=all">
-                    {% trans "All" %}
-                    {% if status == log_threshold %}<span class="badge bg-green ms-auto"></span>{% endif %}
-                  </a>
-                  <a class="dropdown-item d-flex justify-content-between" href="{% url 'core:plugin_list' %}?status=installed">
-                    {% trans "Installed" %}
-                    {% if status == log_threshold %}<span class="badge bg-green ms-auto"></span>{% endif %}
-                  </a>
+                  {% for level, name in status_choices.items %}
+                    <a class="dropdown-item d-flex justify-content-between" href="{% url 'core:plugin_list' %}?status={{ level }}">
+                      {{ name }}
+                      {% if level == status %}<span class="badge bg-green ms-auto"></span>{% endif %}
+                    </a>
+                  {% endfor %}
                 </div>
               </div>
             </div>
@@ -57,28 +55,18 @@
 
           <div class="col-auto">
             <div class="px-2 d-print-none">
-              {% trans "Sort" %}
+                {% trans "Sort" %}
               <div class="dropdown">
                 <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-                  {% trans "Sort" %}
+                  {{ sort_choices|get_key:sort }}
                 </button>
                 <div class="dropdown-menu">
-                  <a class="dropdown-item d-flex justify-content-between" href="{% url 'core:plugin_list' %}?sort=az">
-                    {% trans "By Name (A-Z)" %}
-                    {% if sort == log_threshold %}<span class="badge bg-green ms-auto"></span>{% endif %}
-                  </a>
-                  <a class="dropdown-item d-flex justify-content-between" href="{% url 'core:plugin_list' %}?sort=za">
-                    {% trans "By Name (Z-A)" %}
-                    {% if sort == log_threshold %}<span class="badge bg-green ms-auto"></span>{% endif %}
-                  </a>
-                  <a class="dropdown-item d-flex justify-content-between" href="{% url 'core:plugin_list' %}?sort=updated">
-                    {% trans "By updated date" %}
-                    {% if sort == log_threshold %}<span class="badge bg-green ms-auto"></span>{% endif %}
-                  </a>
-                  <a class="dropdown-item d-flex justify-content-between" href="{% url 'core:plugin_list' %}?sort=published">
-                    {% trans "By published date" %}
-                    {% if sort == log_threshold %}<span class="badge bg-green ms-auto"></span>{% endif %}
-                  </a>
+                  {% for level, name in sort_choices.items %}
+                    <a class="dropdown-item d-flex justify-content-between" href="{% url 'core:plugin_list' %}?sort={{ level }}">
+                      {{ name }}
+                      {% if level == sort %}<span class="badge bg-green ms-auto"></span>{% endif %}
+                    </a>
+                  {% endfor %}
                 </div>
               </div>
             </div>