From 5bf68493df86b10abd266762e53e3d29d1163884 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 25 Feb 2020 12:34:48 -0500 Subject: [PATCH] Changelog & cleanup for #4267 --- docs/release-notes/version-2.7.md | 1 + .../dcim/inc/rack_elevation_header.html | 10 ++++++++++ netbox/templates/dcim/rack_elevation_list.html | 16 ++-------------- 3 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 netbox/templates/dcim/inc/rack_elevation_header.html diff --git a/docs/release-notes/version-2.7.md b/docs/release-notes/version-2.7.md index 4f0fc2670..53520447b 100644 --- a/docs/release-notes/version-2.7.md +++ b/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 diff --git a/netbox/templates/dcim/inc/rack_elevation_header.html b/netbox/templates/dcim/inc/rack_elevation_header.html new file mode 100644 index 000000000..36ac11398 --- /dev/null +++ b/netbox/templates/dcim/inc/rack_elevation_header.html @@ -0,0 +1,10 @@ +{% load helpers %} +
+ {{ rack.name }} + {% if rack.role %} +
{{ rack.role }} + {% endif %} + {% if rack.facility_id %} +
{{ rack.facility_id }} + {% endif %} +
diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html index c5164c4f0..f48b81e06 100644 --- a/netbox/templates/dcim/rack_elevation_list.html +++ b/netbox/templates/dcim/rack_elevation_list.html @@ -17,22 +17,10 @@
{% for rack in page %}
-
- {{ rack.name|truncatechars:"25" }} - {% if rack.role %} -
{{ rack.role }} - {% endif %} -

{{ rack.facility_id|truncatechars:"30" }}

-
+ {% include 'dcim/inc/rack_elevation_header.html' %} {% include 'dcim/inc/rack_elevation.html' with face=rack_face %}
-
- {{ rack.name|truncatechars:"25" }} - {% if rack.role %} -
{{ rack.role }} - {% endif %} -

{{ rack.facility_id|truncatechars:"30" }}

-
+ {% include 'dcim/inc/rack_elevation_header.html' %}
{% endfor %}