From 97ff51c7f0ce2e6cc1a6a6745d7d55aaa7f20630 Mon Sep 17 00:00:00 2001
From: Abhimanyu Saharan <desk.abhimanyu@gmail.com>
Date: Tue, 8 Aug 2023 21:45:06 +0530
Subject: [PATCH] removed bulk_delete_control from templates

---
 netbox/netbox/views/generic/object_views.py   |  2 +-
 .../templates/dcim/device/consoleports.html   | 10 ----
 .../dcim/device/consoleserverports.html       | 10 ----
 netbox/templates/dcim/device/frontports.html  | 10 ----
 netbox/templates/dcim/device/interfaces.html  | 10 ----
 .../templates/dcim/device/poweroutlets.html   | 10 ----
 netbox/templates/dcim/device/powerports.html  | 10 ----
 netbox/templates/dcim/device/rearports.html   | 10 ----
 netbox/templates/generic/object_tab.html      | 57 ++++++++++++-------
 9 files changed, 37 insertions(+), 92 deletions(-)

diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py
index a426898fb..2117b5d76 100644
--- a/netbox/netbox/views/generic/object_views.py
+++ b/netbox/netbox/views/generic/object_views.py
@@ -146,7 +146,7 @@ class ObjectChildrenView(ObjectView, ActionsMixin, TableMixin):
             'child_model': self.child_model,
             'base_template': f'{instance._meta.app_label}/{instance._meta.model_name}.html',
             'table': table,
-            'table_config': f'{self.table.__name__}_config',
+            'table_config': f'{self.table.name}_config',
             'actions': actions,
             'tab': self.tab,
             'return_url': request.get_full_path(),
diff --git a/netbox/templates/dcim/device/consoleports.html b/netbox/templates/dcim/device/consoleports.html
index 6cfff6ab2..fba99fba5 100644
--- a/netbox/templates/dcim/device/consoleports.html
+++ b/netbox/templates/dcim/device/consoleports.html
@@ -10,13 +10,3 @@
         </div>
     {% endif %}
 {% endblock %}
-
-{% block bulk_delete_control %}
-    {% if 'bulk_edit' in actions %}
-        <button type="submit" name="_disconnect"
-                formaction="{% url 'dcim:consoleport_bulk_disconnect' %}?return_url={% url 'dcim:device_consoleports' pk=object.pk %}"
-                class="btn btn-outline-danger btn-sm">
-            <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
-        </button>
-    {% endif %}
-{% endblock %}
\ No newline at end of file
diff --git a/netbox/templates/dcim/device/consoleserverports.html b/netbox/templates/dcim/device/consoleserverports.html
index 672c9ae4a..b1fe4a1bc 100644
--- a/netbox/templates/dcim/device/consoleserverports.html
+++ b/netbox/templates/dcim/device/consoleserverports.html
@@ -1,15 +1,5 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block bulk_delete_control %}
-    {% if 'bulk_edit' in actions %}
-        <button type="submit" name="_disconnect"
-                formaction="{% url 'dcim:consoleserverport_bulk_disconnect' %}?return_url={% url 'dcim:device_consoleserverports' pk=object.pk %}"
-                class="btn btn-outline-danger btn-sm">
-            <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
-        </button>
-    {% endif %}
-{% endblock %}
-
 {% block extra_contols_bottom %}
     {% if perms.dcim.add_consoleserverport %}
         <div class="bulk-button-group">
diff --git a/netbox/templates/dcim/device/frontports.html b/netbox/templates/dcim/device/frontports.html
index 86e946475..1b26db3e5 100644
--- a/netbox/templates/dcim/device/frontports.html
+++ b/netbox/templates/dcim/device/frontports.html
@@ -1,15 +1,5 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block bulk_delete_control %}
-    {% if 'bulk_edit' in actions %}
-        <button type="submit" name="_disconnect"
-                formaction="{% url 'dcim:frontport_bulk_disconnect' %}?return_url={% url 'dcim:device_frontports' pk=object.pk %}"
-                class="btn btn-outline-danger btn-sm">
-            <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
-        </button>
-    {% endif %}
-{% endblock %}
-
 {% block extra_contols_bottom %}
     {% if perms.dcim.add_frontport %}
         <div class="bulk-button-group">
diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html
index db96cb44b..843f12444 100644
--- a/netbox/templates/dcim/device/interfaces.html
+++ b/netbox/templates/dcim/device/interfaces.html
@@ -1,15 +1,5 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block bulk_delete_control %}
-    {% if 'bulk_edit' in actions %}
-        <button type="submit" name="_disconnect"
-                formaction="{% url 'dcim:interface_bulk_disconnect' %}?return_url={% url 'dcim:device_interfaces' pk=object.pk %}"
-                class="btn btn-outline-danger btn-sm">
-            <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
-        </button>
-    {% endif %}
-{% endblock %}
-
 {% block extra_contols_bottom %}
     {% if perms.dcim.add_interface %}
         <div class="bulk-button-group">
diff --git a/netbox/templates/dcim/device/poweroutlets.html b/netbox/templates/dcim/device/poweroutlets.html
index 4cc4b2036..735ada210 100644
--- a/netbox/templates/dcim/device/poweroutlets.html
+++ b/netbox/templates/dcim/device/poweroutlets.html
@@ -1,15 +1,5 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block bulk_delete_control %}
-    {% if 'bulk_edit' in actions %}
-        <button type="submit" name="_disconnect"
-                formaction="{% url 'dcim:poweroutlet_bulk_disconnect' %}?return_url={% url 'dcim:device_poweroutlets' pk=object.pk %}"
-                class="btn btn-outline-danger btn-sm">
-            <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
-        </button>
-    {% endif %}
-{% endblock %}
-
 {% block extra_contols_bottom %}
     {% if perms.dcim.add_poweroutlet %}
         <div class="bulk-button-group">
diff --git a/netbox/templates/dcim/device/powerports.html b/netbox/templates/dcim/device/powerports.html
index 5284f1ddc..43667e226 100644
--- a/netbox/templates/dcim/device/powerports.html
+++ b/netbox/templates/dcim/device/powerports.html
@@ -1,15 +1,5 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block bulk_delete_control %}
-    {% if 'bulk_edit' in actions %}
-        <button type="submit" name="_disconnect"
-                formaction="{% url 'dcim:powerport_bulk_disconnect' %}?return_url={% url 'dcim:device_powerports' pk=object.pk %}"
-                class="btn btn-outline-danger btn-sm">
-            <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
-        </button>
-    {% endif %}
-{% endblock %}
-
 {% block extra_contols_bottom %}
     {% if perms.dcim.add_powerport %}
         <div class="bulk-button-group">
diff --git a/netbox/templates/dcim/device/rearports.html b/netbox/templates/dcim/device/rearports.html
index 864765d15..c5babc6f4 100644
--- a/netbox/templates/dcim/device/rearports.html
+++ b/netbox/templates/dcim/device/rearports.html
@@ -1,15 +1,5 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block bulk_delete_control %}
-    {% if 'bulk_edit' in actions %}
-        <button type="submit" name="_disconnect"
-                formaction="{% url 'dcim:rearport_bulk_disconnect' %}?return_url={% url 'dcim:device_rearports' pk=object.pk %}"
-                class="btn btn-outline-danger btn-sm">
-            <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
-        </button>
-    {% endif %}
-{% endblock %}
-
 {% block extra_contols_bottom %}
     {% if perms.dcim.add_rearport %}
         <div class="bulk-button-group">
diff --git a/netbox/templates/generic/object_tab.html b/netbox/templates/generic/object_tab.html
index eaa61b9cc..25329f66c 100644
--- a/netbox/templates/generic/object_tab.html
+++ b/netbox/templates/generic/object_tab.html
@@ -16,32 +16,47 @@
                 <div class="bulk-button-group">
                     {% if 'bulk_edit' in actions %}
                         <div class="btn-group" role="group">
-                          {% with bulk_edit_view=child_model|validated_viewname:"bulk_edit" %}
-                            {% if bulk_edit_view %}
-                              <button type="submit" name="_edit" formaction="{% url bulk_edit_view %}?return_url={{ return_url }}" class="btn btn-warning btn-sm">
-                                <i class="mdi mdi-pencil" aria-hidden="true"></i> Edit
-                              </button>
-                            {% endif %}
-                          {% endwith %}
-                          {% with bulk_rename_view=child_model|validated_viewname:"bulk_rename" %}
-                            {% if bulk_rename_view %}
-                              <button type="submit" name="_rename" formaction="{% url bulk_rename_view %}?return_url={{ return_url }}" class="btn btn-outline-warning btn-sm">
-                                <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> Rename
-                              </button>
-                            {% endif %}
-                          {% endwith %}
+                            {% with bulk_edit_view=child_model|validated_viewname:"bulk_edit" %}
+                                {% if bulk_edit_view %}
+                                    <button type="submit" name="_edit"
+                                            formaction="{% url bulk_edit_view %}?return_url={{ return_url }}"
+                                            class="btn btn-warning btn-sm">
+                                        <i class="mdi mdi-pencil" aria-hidden="true"></i> Edit
+                                    </button>
+                                {% endif %}
+                            {% endwith %}
+                            {% with bulk_rename_view=child_model|validated_viewname:"bulk_rename" %}
+                                {% if bulk_rename_view %}
+                                    <button type="submit" name="_rename"
+                                            formaction="{% url bulk_rename_view %}?return_url={{ return_url }}"
+                                            class="btn btn-outline-warning btn-sm">
+                                        <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> Rename
+                                    </button>
+                                {% endif %}
+                            {% endwith %}
                         </div>
                     {% endif %}
                     <div class="btn-group" role="group">
                         {% with bulk_delete_view=child_model|validated_viewname:"bulk_delete" %}
-                          {% if 'bulk_delete' in actions and bulk_delete_view %}
-                            <button type="submit" formaction="{% url bulk_delete_view %}?return_url={{ return_url }}" class="btn btn-danger btn-sm">
-                              <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> Delete
-                            </button>
-                          {% endif %}
+                            {% if 'bulk_delete' in actions and bulk_delete_view %}
+                                <button type="submit"
+                                        formaction="{% url bulk_delete_view %}?return_url={{ return_url }}"
+                                        class="btn btn-danger btn-sm">
+                                    <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> Delete
+                                </button>
+                            {% endif %}
                         {% endwith %}
-                        {% block bulk_delete_control %}
-                        {% endblock %}
+                        {% if 'bulk_edit' in actions %}
+                            {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %}
+                                {% if bulk_disconnect_view %}
+                                    <button type="submit" name="_disconnect"
+                                            formaction="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
+                                            class="btn btn-outline-danger btn-sm">
+                                        <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> Disconnect
+                                    </button>
+                                {% endif %}
+                            {% endwith %}
+                        {% endif %}
                     </div>
                 </div>
                 {% block extra_contols_bottom %}