- {% include 'dcim/inc/devicetype_table.html' %}
+ {% include 'utilities/obj_table.html' with bulk_edit_url='dcim:devicetype_bulk_edit' bulk_delete_url='dcim:devicetype_bulk_delete' %}
{% include 'inc/filter_panel.html' %}
diff --git a/netbox/templates/dcim/inc/device_table.html b/netbox/templates/dcim/inc/device_table.html
deleted file mode 100644
index 99ee199b2..000000000
--- a/netbox/templates/dcim/inc/device_table.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% load render_table from django_tables2 %}
-{% if perms.dcim.add_interface or perms.dcim.change_device or perms.dcim.delete_device %}
-
-{% else %}
- {% render_table table table_template|default:'table.html' %}
-{% endif %}
diff --git a/netbox/templates/dcim/inc/devicerole_table.html b/netbox/templates/dcim/inc/devicerole_table.html
deleted file mode 100644
index 54f8c3547..000000000
--- a/netbox/templates/dcim/inc/devicerole_table.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load render_table from django_tables2 %}
-{% if perms.dcim.delete_devicerole %}
-
-{% else %}
- {% render_table table table_template|default:'table.html' %}
-{% endif %}
diff --git a/netbox/templates/dcim/inc/devicetype_table.html b/netbox/templates/dcim/inc/devicetype_table.html
deleted file mode 100644
index 23fbf7627..000000000
--- a/netbox/templates/dcim/inc/devicetype_table.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% load render_table from django_tables2 %}
-{% if perms.dcim.change_devicetype or perms.dcim.delete_devicetype %}
-
-{% else %}
- {% render_table table table_template|default:'table.html' %}
-{% endif %}
diff --git a/netbox/templates/dcim/inc/manufacturer_table.html b/netbox/templates/dcim/inc/manufacturer_table.html
deleted file mode 100644
index a2d8ce2ac..000000000
--- a/netbox/templates/dcim/inc/manufacturer_table.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load render_table from django_tables2 %}
-{% if perms.dcim.delete_manufacturer %}
-
-{% else %}
- {% render_table table table_template|default:'table.html' %}
-{% endif %}
diff --git a/netbox/templates/dcim/inc/platform_table.html b/netbox/templates/dcim/inc/platform_table.html
deleted file mode 100644
index 503f8c34b..000000000
--- a/netbox/templates/dcim/inc/platform_table.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load render_table from django_tables2 %}
-{% if perms.dcim.delete_platform %}
-
-{% else %}
- {% render_table table table_template|default:'table.html' %}
-{% endif %}
diff --git a/netbox/templates/dcim/inc/rack_table.html b/netbox/templates/dcim/inc/rack_table.html
deleted file mode 100644
index b0818d1f7..000000000
--- a/netbox/templates/dcim/inc/rack_table.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% load render_table from django_tables2 %}
-{% if perms.dcim.change_rack or perms.dcim.delete_rack %}
-
-{% else %}
- {% render_table table table_template|default:'table.html' %}
-{% endif %}
diff --git a/netbox/templates/dcim/inc/rackgroup_table.html b/netbox/templates/dcim/inc/rackgroup_table.html
deleted file mode 100644
index 0995221eb..000000000
--- a/netbox/templates/dcim/inc/rackgroup_table.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load render_table from django_tables2 %}
-{% if perms.dcim.delete_rackgroup %}
-
-{% else %}
- {% render_table table table_template|default:'table.html' %}
-{% endif %}
diff --git a/netbox/templates/dcim/manufacturer_list.html b/netbox/templates/dcim/manufacturer_list.html
index 6cbe1092f..9a6f15427 100644
--- a/netbox/templates/dcim/manufacturer_list.html
+++ b/netbox/templates/dcim/manufacturer_list.html
@@ -15,7 +15,7 @@
Manufacturers
- {% include 'dcim/inc/manufacturer_table.html' %}
+ {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:manufacturer_bulk_delete' %}
{% endblock %}
diff --git a/netbox/templates/dcim/platform_list.html b/netbox/templates/dcim/platform_list.html
index 498ab7a97..8f5f40ad9 100644
--- a/netbox/templates/dcim/platform_list.html
+++ b/netbox/templates/dcim/platform_list.html
@@ -15,7 +15,7 @@
Platforms
- {% include 'dcim/inc/platform_table.html' %}
+ {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:platform_bulk_delete' %}
{% endblock %}
diff --git a/netbox/templates/dcim/rack_list.html b/netbox/templates/dcim/rack_list.html
index a80e40fd2..393d686e8 100644
--- a/netbox/templates/dcim/rack_list.html
+++ b/netbox/templates/dcim/rack_list.html
@@ -32,7 +32,7 @@
Racks
- {% include 'dcim/inc/rack_table.html' %}
+ {% include 'utilities/obj_table.html' with bulk_edit_url='dcim:rack_bulk_edit' bulk_delete_url='dcim:rack_bulk_delete' %}
diff --git a/netbox/templates/dcim/rackgroup_list.html b/netbox/templates/dcim/rackgroup_list.html
index 32373e289..e0a1e59f3 100644
--- a/netbox/templates/dcim/rackgroup_list.html
+++ b/netbox/templates/dcim/rackgroup_list.html
@@ -15,7 +15,7 @@
Rack Groups
- {% include 'dcim/inc/rackgroup_table.html' %}
+ {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:rackgroup_bulk_delete' %}
{% include 'inc/filter_panel.html' %}
diff --git a/netbox/templates/secrets/inc/secret_table.html b/netbox/templates/secrets/inc/secret_table.html
deleted file mode 100644
index ce97aa6d2..000000000
--- a/netbox/templates/secrets/inc/secret_table.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% load render_table from django_tables2 %}
-{% if perms.secrets.change_secret or perms.secrets.delete_secret %}
-
-{% else %}
- {% render_table table table_template|default:'table.html' %}
-{% endif %}
diff --git a/netbox/templates/secrets/inc/secretrole_table.html b/netbox/templates/secrets/inc/secretrole_table.html
deleted file mode 100644
index 6e110bda7..000000000
--- a/netbox/templates/secrets/inc/secretrole_table.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load render_table from django_tables2 %}
-{% if perms.secrets.delete_secretrole %}
-
-{% else %}
- {% render_table table table_template|default:'table.html' %}
-{% endif %}
diff --git a/netbox/templates/secrets/secret_list.html b/netbox/templates/secrets/secret_list.html
index 9a0182a8c..c9a785084 100644
--- a/netbox/templates/secrets/secret_list.html
+++ b/netbox/templates/secrets/secret_list.html
@@ -15,7 +15,7 @@
Secrets
- {% include 'secrets/inc/secret_table.html' %}
+ {% include 'utilities/obj_table.html' with bulk_edit_url='secrets:secret_bulk_edit' bulk_delete_url='secrets:secret_bulk_delete' %}
{% include 'inc/filter_panel.html' %}
diff --git a/netbox/templates/secrets/secretrole_list.html b/netbox/templates/secrets/secretrole_list.html
index 62941fde0..2ad708248 100644
--- a/netbox/templates/secrets/secretrole_list.html
+++ b/netbox/templates/secrets/secretrole_list.html
@@ -15,7 +15,7 @@
Device Roles
- {% include 'secrets/inc/secretrole_table.html' %}
+ {% include 'utilities/obj_table.html' with bulk_delete_url='secrets:secretrole_bulk_delete' %}
{% endblock %}