Просмотр исходного кода

Fixes #5683: Correct rack elevation displayed when viewing a reservation

Jeremy Stretch 5 лет назад
Родитель
Сommit
d4e83ca1c0
2 измененных файлов с 12 добавлено и 13 удалено
  1. 1 0
      docs/release-notes/version-2.10.md
  2. 11 13
      netbox/templates/dcim/rackreservation.html

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

@@ -19,6 +19,7 @@
 * [#5640](https://github.com/netbox-community/netbox/issues/5640) - Fix permissions assessment when adding VM interfaces in bulk
 * [#5648](https://github.com/netbox-community/netbox/issues/5648) - Include VC member interfaces on interfaces tab count when viewing VC master
 * [#5665](https://github.com/netbox-community/netbox/issues/5665) - Validate rack group is assigned to same site when creating a rack
+* [#5683](https://github.com/netbox-community/netbox/issues/5683) - Correct rack elevation displayed when viewing a reservation
 
 ---
 

+ 11 - 13
netbox/templates/dcim/rackreservation.html

@@ -127,22 +127,20 @@
         {% plugin_left_page object %}
 	</div>
     <div class="col-md-6">
-        {% with rack=object.rack %}
-            <div class="row" style="margin-bottom: 20px">
-                <div class="col-md-6 col-sm-6 col-xs-12">
-                    <div class="rack_header">
-                        <h4>Front</h4>
-                    </div>
-                    {% include 'dcim/inc/rack_elevation.html' with face='front' %}
+        <div class="row" style="margin-bottom: 20px">
+            <div class="col-md-6 col-sm-6 col-xs-12">
+                <div class="rack_header">
+                    <h4>Front</h4>
                 </div>
-                <div class="col-md-6 col-sm-6 col-xs-12">
-                    <div class="rack_header">
-                        <h4>Rear</h4>
-                    </div>
-                    {% include 'dcim/inc/rack_elevation.html' with face='rear' %}
+                {% include 'dcim/inc/rack_elevation.html' with object=object.rack face='front' %}
+            </div>
+            <div class="col-md-6 col-sm-6 col-xs-12">
+                <div class="rack_header">
+                    <h4>Rear</h4>
                 </div>
+                {% include 'dcim/inc/rack_elevation.html' with object=object.rack face='rear' %}
             </div>
-        {% endwith %}
+        </div>
         {% plugin_right_page object %}
     </div>
 </div>