From 8ed79d5973c77b489b27fe01ac70cd87ffeacbd5 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 14 Dec 2021 16:44:03 -0500 Subject: [PATCH] Remove obsolete templates --- netbox/templates/inc/table_controls.html | 27 --------- netbox/templates/ipam/ipaddress_assign.html | 5 +- netbox/templates/utilities/obj_table.html | 62 --------------------- 3 files changed, 4 insertions(+), 90 deletions(-) delete mode 100644 netbox/templates/inc/table_controls.html delete mode 100644 netbox/templates/utilities/obj_table.html diff --git a/netbox/templates/inc/table_controls.html b/netbox/templates/inc/table_controls.html deleted file mode 100644 index d6bd60077..000000000 --- a/netbox/templates/inc/table_controls.html +++ /dev/null @@ -1,27 +0,0 @@ -
-
-
- -
-
-
- {% if request.user.is_authenticated and table_modal %} -
- -
- {% endif %} -
-
diff --git a/netbox/templates/ipam/ipaddress_assign.html b/netbox/templates/ipam/ipaddress_assign.html index 9a052d966..3965feebc 100644 --- a/netbox/templates/ipam/ipaddress_assign.html +++ b/netbox/templates/ipam/ipaddress_assign.html @@ -2,6 +2,7 @@ {% load static %} {% load form_helpers %} {% load helpers %} +{% load render_table from django_tables2 %} {% block title %}Assign an IP Address{% endblock title %} @@ -35,7 +36,9 @@

Search Results

- {% include 'utilities/obj_table.html' %} +
+ {% render_table table 'inc/table.html' %} +
{% endif %} diff --git a/netbox/templates/utilities/obj_table.html b/netbox/templates/utilities/obj_table.html deleted file mode 100644 index 10337ff43..000000000 --- a/netbox/templates/utilities/obj_table.html +++ /dev/null @@ -1,62 +0,0 @@ -{% load helpers %} -{% load render_table from django_tables2 %} - -{% if permissions.change or permissions.delete %} -
- {% csrf_token %} - - - {% if table.paginator.num_pages > 1 %} -
-
-
- {% if bulk_edit_url and permissions.change %} - - {% endif %} - {% if bulk_delete_url and permissions.delete %} - - {% endif %} -
-
- - -
-
-
- {% endif %} - -
- {% render_table table 'inc/table.html' %} -
- -
- {% block extra_actions %}{% endblock %} - - {% if bulk_edit_url and permissions.change %} - - {% endif %} - - {% if bulk_delete_url and permissions.delete %} - - {% endif %} -
-
-{% else %} - -
- {% render_table table 'inc/table.html' %} -
- -{% endif %} - -{% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}