Jeremy Stretch 6 лет назад
Родитель
Сommit
5bf68493df

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

@@ -6,6 +6,7 @@
 * [#4173](https://github.com/netbox-community/netbox/issues/4173) - Return graceful error message when webhook queuing fails
 * [#4227](https://github.com/netbox-community/netbox/issues/4227) - Omit internal fields from the change log data
 * [#4237](https://github.com/netbox-community/netbox/issues/4237) - Support Jinja2 templating for webhook payload and headers
+* [#4267](https://github.com/netbox-community/netbox/issues/4267) - Denote rack role on rack elevations list
 
 ## Bug Fixes
 

+ 10 - 0
netbox/templates/dcim/inc/rack_elevation_header.html

@@ -0,0 +1,10 @@
+{% load helpers %}
+<div class="rack_header">
+    <strong><a href="{% url 'dcim:rack' pk=rack.pk %}">{{ rack.name }}</a></strong>
+    {% if rack.role %}
+        <br /><small class="label" style="color: {{ rack.role.color|fgcolor }}; background-color: #{{ rack.role.color }}">{{ rack.role }}</small>
+    {% endif %}
+    {% if rack.facility_id %}
+        <br /><small class="text-muted">{{ rack.facility_id }}</small>
+    {% endif %}
+</div>

+ 2 - 14
netbox/templates/dcim/rack_elevation_list.html

@@ -17,22 +17,10 @@
             <div style="white-space: nowrap; overflow-x: scroll;">
                 {% for rack in page %}
                     <div style="display: inline-block; width: 266px">
-                        <div class="rack_header">
-                            <strong><a href="{% url 'dcim:rack' pk=rack.pk %}">{{ rack.name|truncatechars:"25" }}</a></strong>
-                            {% if rack.role %}
-                            <br/><small class="label" style="color: {{ rack.role.color|fgcolor }}; background-color: #{{ rack.role.color }}">{{ rack.role }}</small>
-                            {% endif %}
-                            <p><small class="text-muted">{{ rack.facility_id|truncatechars:"30" }}</small></p>
-                        </div>
+                        {% include 'dcim/inc/rack_elevation_header.html' %}
                         {% include 'dcim/inc/rack_elevation.html' with face=rack_face %}
                         <div class="clearfix"></div>
-                        <div class="rack_header">
-                            <strong><a href="{% url 'dcim:rack' pk=rack.pk %}">{{ rack.name|truncatechars:"25" }}</a></strong>
-                            {% if rack.role %}
-                            <br/><small class="label" style="color: {{ rack.role.color|fgcolor }}; background-color: #{{ rack.role.color }}">{{ rack.role }}</small>
-                            {% endif %}
-                            <p><small class="text-muted">{{ rack.facility_id|truncatechars:"30" }}</small></p>
-                        </div>
+                        {% include 'dcim/inc/rack_elevation_header.html' %}
                     </div>
                 {% endfor %}
             </div>