NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-14 01:41:22 -06:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fixes #3283: Fix rack group assignment on PowerFeed CSV import

Browse Source
This commit is contained in:
Jeremy Stretch 2019-06-24 11:10:35 -04:00
parent 653770ede9
commit 251ba08e09
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@ v2.6.1 (FUTURE)
* [#3275](https://github.com/digitalocean/netbox/issues/3275) - Fix error when adding power outlets to a device type * [#3275](https://github.com/digitalocean/netbox/issues/3275) - Fix error when adding power outlets to a device type
* [#3279](https://github.com/digitalocean/netbox/issues/3279) - Reset the PostgreSQL sequence for Tag and TaggedItem IDs * [#3279](https://github.com/digitalocean/netbox/issues/3279) - Reset the PostgreSQL sequence for Tag and TaggedItem IDs
* [#3283](https://github.com/digitalocean/netbox/issues/3283) - Fix rack group assignment on PowerFeed CSV import
* [#3290](https://github.com/digitalocean/netbox/issues/3290) - Fix server error when viewing cascaded PDUs * [#3290](https://github.com/digitalocean/netbox/issues/3290) - Fix server error when viewing cascaded PDUs
* [#3292](https://github.com/digitalocean/netbox/issues/3292) - Ignore empty URL query parameters * [#3292](https://github.com/digitalocean/netbox/issues/3292) - Ignore empty URL query parameters

2
netbox/dcim/forms.py
View File

@ -3585,7 +3585,7 @@ class PowerFeedCSVForm(forms.ModelForm):
# Validate rack # Validate rack
if rack_name: if rack_name:
try: try:
self.instance.rack = Rack.objects.get(site=site, rack_group=rack_group, name=rack_name) self.instance.rack = Rack.objects.get(site=site, group__name=rack_group, name=rack_name)
except Rack.DoesNotExist: except Rack.DoesNotExist:
raise forms.ValidationError( raise forms.ValidationError(
"Rack {} not found in site {}, group {}".format(rack_name, site, rack_group) "Rack {} not found in site {}, group {}".format(rack_name, site, rack_group)