NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-15 00:02:17 -06:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Closes #17761: Store empty CharField choices as null

Browse Source
This commit is contained in:
Jeremy Stretch
2024-10-18 16:55:58 -04:00
parent 75270c1aef
commit ef1fdf0a01
23 changed files with 622 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
netbox/dcim/models/racks.py
View File

@@ -83,7 +83,8 @@ class RackBase(WeightMixin, PrimaryModel):
verbose_name=_('outer unit'),
max_length=50,
choices=RackDimensionUnitChoices,
blank=True
blank=True,
null=True
)
mounting_depth = models.PositiveSmallIntegerField(
verbose_name=_('mounting depth'),
@@ -188,7 +189,7 @@ class RackType(RackBase):
# Clear unit if outer width & depth are not set
if self.outer_width is None and self.outer_depth is None:
self.outer_unit = ''
self.outer_unit = None
super().save(*args, **kwargs)
@@ -242,6 +243,7 @@ class Rack(ContactsMixin, ImageAttachmentsMixin, RackBase):
choices=RackFormFactorChoices,
max_length=50,
blank=True,
null=True,
verbose_name=_('form factor')
)
rack_type = models.ForeignKey(
@@ -317,7 +319,8 @@ class Rack(ContactsMixin, ImageAttachmentsMixin, RackBase):
verbose_name=_('airflow'),
max_length=50,
choices=RackAirflowChoices,
blank=True
blank=True,
null=True
)
# Generic relations
@@ -409,7 +412,7 @@ class Rack(ContactsMixin, ImageAttachmentsMixin, RackBase):
# Clear unit if outer width & depth are not set
if self.outer_width is None and self.outer_depth is None:
self.outer_unit = ''
self.outer_unit = None
super().save(*args, **kwargs)