NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 01:48:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

13845 fix device type image save (#13851)

Browse Source 
* 13845 check original image is null in save

* 13845 update delete image code
This commit is contained in:
Arthur Hanson 2023-09-25 10:41:21 -07:00 committed by GitHub
parent 04796a6ac6
commit 0ce2b1b779
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/dcim/models/devices.py
View File

@ -4,6 +4,7 @@ import yaml
from functools import cached_property from functools import cached_property
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core.files.storage import default_storage
from django.core.validators import MaxValueValidator, MinValueValidator from django.core.validators import MaxValueValidator, MinValueValidator
from django.db import models from django.db import models
from django.db.models import F, ProtectedError from django.db.models import F, ProtectedError
@ -332,10 +333,10 @@ class DeviceType(ImageAttachmentsMixin, PrimaryModel, WeightMixin):
ret = super().save(*args, **kwargs) ret = super().save(*args, **kwargs)
# Delete any previously uploaded image files that are no longer in use # Delete any previously uploaded image files that are no longer in use
if self.front_image != self._original_front_image: if self._original_front_image and self.front_image != self._original_front_image:
self._original_front_image.delete(save=False) default_storage.delete(self._original_front_image)
if self.rear_image != self._original_rear_image: if self._original_rear_image and self.rear_image != self._original_rear_image:
self._original_rear_image.delete(save=False) default_storage.delete(self._original_rear_image)
return ret return ret