From a054aff3c431e44a4d2f395fd7cb06a4adb97b28 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 13 Feb 2020 14:19:14 -0500
Subject: [PATCH] Migrate secrets views to use common object list template

---
 netbox/secrets/views.py                       |  3 +--
 netbox/templates/secrets/secret_list.html     | 20 -------------------
 netbox/templates/secrets/secretrole_list.html | 18 -----------------
 3 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 netbox/templates/secrets/secret_list.html
 delete mode 100644 netbox/templates/secrets/secretrole_list.html

diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index 288edaa6f..d92e4b64d 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -35,7 +35,6 @@ class SecretRoleListView(PermissionRequiredMixin, ObjectListView):
     permission_required = 'secrets.view_secretrole'
     queryset = SecretRole.objects.annotate(secret_count=Count('secrets'))
     table = tables.SecretRoleTable
-    template_name = 'secrets/secretrole_list.html'
 
 
 class SecretRoleCreateView(PermissionRequiredMixin, ObjectEditView):
@@ -73,7 +72,7 @@ class SecretListView(PermissionRequiredMixin, ObjectListView):
     filterset = filters.SecretFilterSet
     filterset_form = forms.SecretFilterForm
     table = tables.SecretTable
-    template_name = 'secrets/secret_list.html'
+    action_buttons = ('import', 'export')
 
 
 class SecretView(PermissionRequiredMixin, View):
diff --git a/netbox/templates/secrets/secret_list.html b/netbox/templates/secrets/secret_list.html
deleted file mode 100644
index ee631b439..000000000
--- a/netbox/templates/secrets/secret_list.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends '_base.html' %}
-{% load buttons %}
-
-{% block content %}
-<div class="pull-right noprint">
-    {% if perms.secrets.add_secret %}
-        {% import_button 'secrets:secret_import' %}
-    {% endif %}
-    {% export_button content_type %}
-</div>
-<h1>{% block title %}Secrets{% endblock %}</h1>
-<div class="row">
-    <div class="col-md-9">
-        {% include 'utilities/obj_table.html' with bulk_edit_url='secrets:secret_bulk_edit' bulk_delete_url='secrets:secret_bulk_delete' %}
-    </div>
-    <div class="col-md-3 noprint">
-		{% include 'inc/search_panel.html' %}
-    </div>
-</div>
-{% endblock %}
diff --git a/netbox/templates/secrets/secretrole_list.html b/netbox/templates/secrets/secretrole_list.html
deleted file mode 100644
index 0e4caadae..000000000
--- a/netbox/templates/secrets/secretrole_list.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends '_base.html' %}
-{% load buttons %}
-
-{% block content %}
-<div class="pull-right noprint">
-    {% if perms.secrets.add_secretrole %}
-        {% add_button 'secrets:secretrole_add' %}
-        {% import_button 'secrets:secretrole_import' %}
-    {% endif %}
-    {% export_button content_type %}
-</div>
-<h1>{% block title %}Secret Roles{% endblock %}</h1>
-<div class="row">
-	<div class="col-md-12">
-        {% include 'utilities/obj_table.html' with bulk_delete_url='secrets:secretrole_bulk_delete' %}
-    </div>
-</div>
-{% endblock %}