From 578056ec0f7376b3af6fb510f89264822cfb81c0 Mon Sep 17 00:00:00 2001
From: Arthur Hanson <worldnomad@gmail.com>
Date: Mon, 15 Jul 2024 16:13:08 +0700
Subject: [PATCH] 14731 change to table

---
 netbox/core/views.py                    |  4 +--
 netbox/templates/core/htmx/plugins.html |  9 -------
 netbox/templates/core/plugin_list.html  | 34 +++++++++++++------------
 3 files changed, 20 insertions(+), 27 deletions(-)
 delete mode 100644 netbox/templates/core/htmx/plugins.html

diff --git a/netbox/core/views.py b/netbox/core/views.py
index 766f6e5e6..73789361d 100644
--- a/netbox/core/views.py
+++ b/netbox/core/views.py
@@ -768,8 +768,8 @@ def get_catalog_plugins(plugins):
 
 
 def get_plugins():
-    # if plugins := cache.get('plugins-catalog-feed'):
-    #     return plugins
+    if plugins := cache.get('plugins-catalog-feed'):
+        return plugins
 
     plugins = {}
     plugins = get_local_plugins(plugins)
diff --git a/netbox/templates/core/htmx/plugins.html b/netbox/templates/core/htmx/plugins.html
deleted file mode 100644
index da0fe1dad..000000000
--- a/netbox/templates/core/htmx/plugins.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load buttons %}
-{% load helpers %}
-{% load i18n %}
-
-    <div class="card">
-      <div class="table-responsive" id="object_list">
-        {% include 'htmx/table.html' %}
-      </div>
-    </div>
diff --git a/netbox/templates/core/plugin_list.html b/netbox/templates/core/plugin_list.html
index a8c29507d..60883e482 100644
--- a/netbox/templates/core/plugin_list.html
+++ b/netbox/templates/core/plugin_list.html
@@ -1,4 +1,4 @@
-{% extends 'generic/_base.html' %}
+{% extends 'generic/object_list.html' %}
 {% load buttons %}
 {% load helpers %}
 {% load i18n %}
@@ -18,24 +18,26 @@
 {% endblock tabs %}
 
 {% block content %}
-  <p>{% trans "NetBox plugins enable you to document and model new kinds of resources, connect automations, add workflows, and much more." %}</p>
+  <div class="tab-pane show active" id="object-list" role="tabpanel" aria-labelledby="object-list-tab">
+    <p>{% trans "NetBox plugins enable you to document and model new kinds of resources, connect automations, add workflows, and much more." %}</p>
 
-  <div class="row mb-3" id="results">
-    <div class="col-auto d-print-none">
-      <div class="input-group input-group-flat me-2 mt-2 quicksearch" hx-disinherit="hx-select hx-swap">
-        <input type="search" results="5" name="q" id="quicksearch" class="form-control" placeholder="{% trans "Quick search" %}"
-            hx-get="{{ request.full_path }}" hx-target="#plugins_list" hx-trigger="keyup changed delay:500ms, search"/>
-        <span class="input-group-text py-1">
-          <a href="#" id="quicksearch_clear" class="invisible text-secondary"><i class="mdi mdi-close-circle"></i></a>
-        </span>
+    <div class="row mb-3" id="results">
+      <div class="col-auto d-print-none">
+        <div class="input-group input-group-flat me-2 mt-2 quicksearch" hx-disinherit="hx-select hx-swap">
+          <input type="search" results="5" name="q" id="quicksearch" class="form-control" placeholder="{% trans "Quick search" %}"
+              hx-get="{{ request.full_path }}" hx-target="#plugins_list" hx-trigger="keyup changed delay:500ms, search"/>
+          <span class="input-group-text py-1">
+            <a href="#" id="quicksearch_clear" class="invisible text-secondary"><i class="mdi mdi-close-circle"></i></a>
+          </span>
+        </div>
+      </div>
+    </div>
+
+    <div class="card">
+      <div class="htmx-container table-responsive" id="object_list">
+        {% include 'htmx/table.html' %}
       </div>
     </div>
 
   </div>
-
-  {# System status #}
-  <div class="row mb-3 htmx-container" id="plugin_list">
-      {% include 'core/htmx/plugins.html' %}
-  </div>
-
 {% endblock content %}