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

Fixes #5058: Correct URL for front rack elevation images when using external storage

Jeremy Stretch 5 лет назад
Родитель
Сommit
5fe4e6cc96
2 измененных файлов с 13 добавлено и 4 удалено
  1. 1 0
      docs/release-notes/version-2.9.md
  2. 12 4
      netbox/dcim/elevations.py

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

@@ -12,6 +12,7 @@
 * [#5041](https://github.com/netbox-community/netbox/issues/5041) - Fix form tabs when assigning an IP to a VM interface
 * [#5041](https://github.com/netbox-community/netbox/issues/5041) - Fix form tabs when assigning an IP to a VM interface
 * [#5042](https://github.com/netbox-community/netbox/issues/5042) - Fix display of SLAAC label for IP addresses status
 * [#5042](https://github.com/netbox-community/netbox/issues/5042) - Fix display of SLAAC label for IP addresses status
 * [#5045](https://github.com/netbox-community/netbox/issues/5045) - Allow assignment of interfaces to non-master VC peer LAG during import
 * [#5045](https://github.com/netbox-community/netbox/issues/5045) - Allow assignment of interfaces to non-master VC peer LAG during import
+* [#5058](https://github.com/netbox-community/netbox/issues/5058) - Correct URL for front rack elevation images when using external storage
 * [#5059](https://github.com/netbox-community/netbox/issues/5059) - Fix inclusion of checkboxes for interfaces in virtual machine view
 * [#5059](https://github.com/netbox-community/netbox/issues/5059) - Fix inclusion of checkboxes for interfaces in virtual machine view
 
 
 ---
 ---

+ 12 - 4
netbox/dcim/elevations.py

@@ -94,8 +94,12 @@ class RackElevationSVG:
 
 
         # Embed front device type image if one exists
         # Embed front device type image if one exists
         if self.include_images and device.device_type.front_image:
         if self.include_images and device.device_type.front_image:
-            url = '{}{}'.format(self.base_url, device.device_type.front_image.url)
-            image = drawing.image(href=url, insert=start, size=end, class_='device-image')
+            image = drawing.image(
+                href=device.device_type.front_image.url,
+                insert=start,
+                size=end,
+                class_='device-image'
+            )
             image.fit(scale='slice')
             image.fit(scale='slice')
             link.add(image)
             link.add(image)
 
 
@@ -107,8 +111,12 @@ class RackElevationSVG:
 
 
         # Embed rear device type image if one exists
         # Embed rear device type image if one exists
         if self.include_images and device.device_type.rear_image:
         if self.include_images and device.device_type.rear_image:
-            url = device.device_type.rear_image.url
-            image = drawing.image(href=url, insert=start, size=end, class_='device-image')
+            image = drawing.image(
+                href=device.device_type.rear_image.url,
+                insert=start,
+                size=end,
+                class_='device-image'
+            )
             image.fit(scale='slice')
             image.fit(scale='slice')
             drawing.add(image)
             drawing.add(image)