Merge pull request #9750 from smuth4/fix/broken-image-urls

Fixes #9634: Respect image URLs which are already fully formed
This commit is contained in:
Jeremy Stretch 2022-07-19 12:46:32 -04:00 committed by GitHub
commit 124ff23e3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -113,8 +113,12 @@ class RackElevationSVG:
# Embed front device type image if one exists
if self.include_images and device.device_type.front_image:
url = device.device_type.front_image.url
# Convert any relative URLs to absolute
if url.startswith('/'):
url = '{}{}'.format(self.base_url, url)
image = drawing.image(
href='{}{}'.format(self.base_url, device.device_type.front_image.url),
href=url,
insert=start,
size=end,
class_='device-image'
@ -139,8 +143,12 @@ class RackElevationSVG:
# Embed rear device type image if one exists
if self.include_images and device.device_type.rear_image:
url = device.device_type.rear_image.url
# Convert any relative URLs to absolute
if url.startswith('/'):
url = '{}{}'.format(self.base_url, url)
image = drawing.image(
href='{}{}'.format(self.base_url, device.device_type.rear_image.url),
href=url,
insert=start,
size=end,
class_='device-image'