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

Merge upstream v2.8.5 into develop

Browse Source 
# Conflicts:
#	netbox/dcim/api/serializers.py
#	netbox/dcim/models/__init__.py
#	netbox/extras/constants.py
#	netbox/netbox/admin.py
#	netbox/templates/users/base.html
#	requirements.txt
This commit is contained in:
Marco Ceppi
2020-05-27 15:44:47 -04:00
parent 6f367c415d 68599351aa
commit bb7191e953
343 changed files with 9806 additions and 8232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/startup_scripts/070_rack_roles-required.py
View File

@@ -1,6 +1,6 @@
from dcim.models import RackRole
from ruamel.yaml import YAML
from utilities.forms import COLOR_CHOICES
from utilities.choices import ColorChoices
from pathlib import Path
import sys
@@ -18,7 +18,7 @@ with file.open('r') as stream:
if 'color' in params:
color = params.pop('color')
for color_tpl in COLOR_CHOICES:
for color_tpl in ColorChoices:
if color in color_tpl:
params['color'] = color_tpl[0]