NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-16 12:12:53 -06:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fixes #2369: Corrected time zone validation on site API serializer

Browse Source
This commit is contained in:
Jeremy Stretch 2018-08-20 16:53:23 -04:00
parent c333af33dc
commit e1e41a768a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@ v2.4.4 (FUTURE)
* [#2355](https://github.com/digitalocean/netbox/issues/2355) - Added item count to inventory tab on device view * [#2355](https://github.com/digitalocean/netbox/issues/2355) - Added item count to inventory tab on device view
* [#2368](https://github.com/digitalocean/netbox/issues/2368) - Record change in device changelog when altering cluster assignment * [#2368](https://github.com/digitalocean/netbox/issues/2368) - Record change in device changelog when altering cluster assignment
* [#2369](https://github.com/digitalocean/netbox/issues/2369) - Corrected time zone validation on site API serializer
* [#2370](https://github.com/digitalocean/netbox/issues/2370) - Redirect to parent device after deleting device bays * [#2370](https://github.com/digitalocean/netbox/issues/2370) - Redirect to parent device after deleting device bays
* [#2374](https://github.com/digitalocean/netbox/issues/2374) - Fix toggling display of IP addresses in virtual machine interfaces list * [#2374](https://github.com/digitalocean/netbox/issues/2374) - Fix toggling display of IP addresses in virtual machine interfaces list

7
netbox/utilities/api.py
View File

@ -108,10 +108,9 @@ class TimeZoneField(Field):
def to_internal_value(self, data): def to_internal_value(self, data):
if not data: if not data:
return "" return ""
try: if data not in pytz.common_timezones:
return pytz.timezone(str(data)) raise ValidationError('Unknown time zone "{}" (see pytz.common_timezones for all options)'.format(data))
except pytz.exceptions.UnknownTimeZoneError: return pytz.timezone(data)
raise ValidationError('Invalid time zone "{}"'.format(data))
class SerializedPKRelatedField(PrimaryKeyRelatedField): class SerializedPKRelatedField(PrimaryKeyRelatedField):