NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-11 10:59:36 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fixes #20888: Pass decimal values for min/max on latitude and longitude fields (#20892)
Some checks are pending
CI / build (20.x, 3.10) (push) Waiting to run
Details
CI / build (20.x, 3.11) (push) Waiting to run
Details
CI / build (20.x, 3.12) (push) Waiting to run
Details
CodeQL / Analyze (${{ matrix.language }}) (none, actions) (push) Waiting to run
Details
CodeQL / Analyze (${{ matrix.language }}) (none, javascript-typescript) (push) Waiting to run
Details
CodeQL / Analyze (${{ matrix.language }}) (none, python) (push) Waiting to run
Details

Browse Source
This commit is contained in:
Jeremy Stretch 2025-12-01 13:35:44 -05:00 committed by GitHub
parent dc4bab7477
commit 767dfccd8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
netbox/dcim/migrations/0216_latitude_longitude_validators.py
View File

@ -1,3 +1,5 @@
import decimal
import django.core.validators import django.core.validators
from django.db import migrations, models from django.db import migrations, models
@ -17,8 +19,8 @@ class Migration(migrations.Migration):
max_digits=8, max_digits=8,
null=True, null=True,
validators=[ validators=[
django.core.validators.MinValueValidator(-90.0), django.core.validators.MinValueValidator(decimal.Decimal('-90.0')),
django.core.validators.MaxValueValidator(90.0), django.core.validators.MaxValueValidator(decimal.Decimal('90.0'))
], ],
), ),
), ),
@ -31,8 +33,8 @@ class Migration(migrations.Migration):
max_digits=9, max_digits=9,
null=True, null=True,
validators=[ validators=[
django.core.validators.MinValueValidator(-180.0), django.core.validators.MinValueValidator(decimal.Decimal('-180.0')),
django.core.validators.MaxValueValidator(180.0), django.core.validators.MaxValueValidator(decimal.Decimal('180.0'))
], ],
), ),
), ),
@ -45,8 +47,8 @@ class Migration(migrations.Migration):
max_digits=8, max_digits=8,
null=True, null=True,
validators=[ validators=[
django.core.validators.MinValueValidator(-90.0), django.core.validators.MinValueValidator(decimal.Decimal('-90.0')),
django.core.validators.MaxValueValidator(90.0), django.core.validators.MaxValueValidator(decimal.Decimal('90.0'))
], ],
), ),
), ),
@ -59,8 +61,8 @@ class Migration(migrations.Migration):
max_digits=9, max_digits=9,
null=True, null=True,
validators=[ validators=[
django.core.validators.MinValueValidator(-180.0), django.core.validators.MinValueValidator(decimal.Decimal('-180.0')),
django.core.validators.MaxValueValidator(180.0), django.core.validators.MaxValueValidator(decimal.Decimal('180.0'))
], ],
), ),
), ),

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

@ -646,7 +646,10 @@ class Device(
decimal_places=6, decimal_places=6,
blank=True, blank=True,
null=True, null=True,
validators=[MinValueValidator(-90.0), MaxValueValidator(90.0)], validators=[
MinValueValidator(decimal.Decimal('-90.0')),
MaxValueValidator(decimal.Decimal('90.0'))
],
help_text=_("GPS coordinate in decimal format (xx.yyyyyy)") help_text=_("GPS coordinate in decimal format (xx.yyyyyy)")
) )
longitude = models.DecimalField( longitude = models.DecimalField(
@ -655,7 +658,10 @@ class Device(
decimal_places=6, decimal_places=6,
blank=True, blank=True,
null=True, null=True,
validators=[MinValueValidator(-180.0), MaxValueValidator(180.0)], validators=[
MinValueValidator(decimal.Decimal('-180.0')),
MaxValueValidator(decimal.Decimal('180.0'))
],
help_text=_("GPS coordinate in decimal format (xx.yyyyyy)") help_text=_("GPS coordinate in decimal format (xx.yyyyyy)")
) )
services = GenericRelation( services = GenericRelation(

12
netbox/dcim/models/sites.py
View File

@ -1,3 +1,5 @@
import decimal
from django.contrib.contenttypes.fields import GenericRelation from django.contrib.contenttypes.fields import GenericRelation
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core.validators import MaxValueValidator, MinValueValidator from django.core.validators import MaxValueValidator, MinValueValidator
@ -211,7 +213,10 @@ class Site(ContactsMixin, ImageAttachmentsMixin, PrimaryModel):
decimal_places=6, decimal_places=6,
blank=True, blank=True,
null=True, null=True,
validators=[MinValueValidator(-90.0), MaxValueValidator(90.0)], validators=[
MinValueValidator(decimal.Decimal('-90.0')),
MaxValueValidator(decimal.Decimal('90.0'))
],
help_text=_('GPS coordinate in decimal format (xx.yyyyyy)') help_text=_('GPS coordinate in decimal format (xx.yyyyyy)')
) )
longitude = models.DecimalField( longitude = models.DecimalField(
@ -220,7 +225,10 @@ class Site(ContactsMixin, ImageAttachmentsMixin, PrimaryModel):
decimal_places=6, decimal_places=6,
blank=True, blank=True,
null=True, null=True,
validators=[MinValueValidator(-180.0), MaxValueValidator(180.0)], validators=[
MinValueValidator(decimal.Decimal('-180.0')),
MaxValueValidator(decimal.Decimal('180.0'))
],
help_text=_('GPS coordinate in decimal format (xx.yyyyyy)') help_text=_('GPS coordinate in decimal format (xx.yyyyyy)')
) )