2
0
Эх сурвалжийг харах

Closes #8083: Removed "related devices" panel from device view

jeremystretch 4 жил өмнө
parent
commit
85f9690377

+ 1 - 0
docs/release-notes/version-3.1.md

@@ -8,6 +8,7 @@
 * [#8057](https://github.com/netbox-community/netbox/issues/8057) - Dynamic object tables using HTMX
 * [#8057](https://github.com/netbox-community/netbox/issues/8057) - Dynamic object tables using HTMX
 * [#8080](https://github.com/netbox-community/netbox/issues/8080) - Link to NAT IPs for device/VM primary IPs
 * [#8080](https://github.com/netbox-community/netbox/issues/8080) - Link to NAT IPs for device/VM primary IPs
 * [#8081](https://github.com/netbox-community/netbox/issues/8081) - Allow creating services directly from navigation menu
 * [#8081](https://github.com/netbox-community/netbox/issues/8081) - Allow creating services directly from navigation menu
+* [#8083](https://github.com/netbox-community/netbox/issues/8083) - Removed "related devices" panel from device view
 * [#8108](https://github.com/netbox-community/netbox/issues/8108) - Improve breadcrumb links for device/VM components
 * [#8108](https://github.com/netbox-community/netbox/issues/8108) - Improve breadcrumb links for device/VM components
 
 
 ### Bug Fixes
 ### Bug Fixes

+ 0 - 10
netbox/dcim/views.py

@@ -1316,19 +1316,9 @@ class DeviceView(generic.ObjectView):
         # Services
         # Services
         services = Service.objects.restrict(request.user, 'view').filter(device=instance)
         services = Service.objects.restrict(request.user, 'view').filter(device=instance)
 
 
-        # Find up to ten devices in the same site with the same functional role for quick reference.
-        related_devices = Device.objects.restrict(request.user, 'view').filter(
-            site=instance.site, device_role=instance.device_role
-        ).exclude(
-            pk=instance.pk
-        ).prefetch_related(
-            'rack', 'device_type__manufacturer'
-        )[:10]
-
         return {
         return {
             'services': services,
             'services': services,
             'vc_members': vc_members,
             'vc_members': vc_members,
-            'related_devices': related_devices,
             'active_tab': 'device',
             'active_tab': 'device',
         }
         }
 
 

+ 6 - 39
netbox/templates/dcim/device.html

@@ -148,6 +148,12 @@
                     </div>
                     </div>
                 </div>
                 </div>
             {% endif %}
             {% endif %}
+            {% include 'inc/panels/custom_fields.html' %}
+            {% include 'inc/panels/tags.html' %}
+            {% include 'inc/panels/comments.html' %}
+            {% plugin_left_page object %}
+        </div>
+        <div class="col col-md-6">
             <div class="card">
             <div class="card">
                 <h5 class="card-header">
                 <h5 class="card-header">
                     Management
                     Management
@@ -220,12 +226,6 @@
                     </table>
                     </table>
                 </div>
                 </div>
             </div>
             </div>
-            {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' %}
-            {% include 'inc/panels/comments.html' %}
-            {% plugin_left_page object %}
-        </div>
-        <div class="col col-md-6">
             {% if object.powerports.exists and object.poweroutlets.exists %}
             {% if object.powerports.exists and object.poweroutlets.exists %}
                 <div class="card">
                 <div class="card">
                     <h5 class="card-header">
                     <h5 class="card-header">
@@ -298,39 +298,6 @@
             </div>
             </div>
             {% include 'inc/panels/contacts.html' %}
             {% include 'inc/panels/contacts.html' %}
             {% include 'inc/panels/image_attachments.html' %}
             {% include 'inc/panels/image_attachments.html' %}
-            <div class="card noprint">
-                <h5 class="card-header">
-                    Related Devices
-                </h5>
-                <div class="card-body">
-                    {% if related_devices %}
-                    <table class="table table-hover">
-                        <tr>
-                            <th>Device</th>
-                            <th>Rack</th>
-                            <th>Type</th>
-                        </tr>
-                        {% for rd in related_devices %}
-                        <tr>
-                            <td>
-                                <a href="{% url 'dcim:device' pk=rd.pk %}">{{ rd }}</a>
-                            </td>
-                            <td>
-                                {% if rd.rack %}
-                                    <a href="{% url 'dcim:rack' pk=rd.rack.pk %}">{{ rd.rack }}</a>
-                                {% else %}
-                                    <span class="text-muted">&mdash;</span>
-                                {% endif %}
-                            </td>
-                            <td>{{ rd.device_type }}</td>
-                        </tr>
-                        {% endfor %}
-                    </table>
-                    {% else %}
-                    <div class="text-muted">None</div>
-                    {% endif %}
-                </div>
-            </div>
             {% plugin_right_page object %}
             {% plugin_right_page object %}
         </div>
         </div>
     </div>
     </div>