From b7ad18afb073429c9b79af6c010fd787c2c68b8e Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Wed, 27 May 2020 09:04:44 +0200 Subject: [PATCH 1/2] Fix #303 for Netbox v2.8.5 In this Netbox version the ColorChoices where moved to utilities.choiceFix #303 for Netbox v2.8.5 In this Netbox version the ColorChoices where moved to utilities.choicess --- startup_scripts/070_rack_roles.py | 4 ++-- startup_scripts/090_device_roles.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/startup_scripts/070_rack_roles.py b/startup_scripts/070_rack_roles.py index 98a5be4..f5aa2ce 100644 --- a/startup_scripts/070_rack_roles.py +++ b/startup_scripts/070_rack_roles.py @@ -1,5 +1,5 @@ from dcim.models import RackRole -from utilities.forms import COLOR_CHOICES +from utilities.choices import ColorChoices from startup_script_utils import load_yaml import sys @@ -13,7 +13,7 @@ for params in rack_roles: 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] diff --git a/startup_scripts/090_device_roles.py b/startup_scripts/090_device_roles.py index c75253d..5225cc0 100644 --- a/startup_scripts/090_device_roles.py +++ b/startup_scripts/090_device_roles.py @@ -1,5 +1,6 @@ from dcim.models import DeviceRole -from utilities.forms import COLOR_CHOICES +from utilities.choices import ColorChoices + from startup_script_utils import load_yaml import sys @@ -13,7 +14,7 @@ for params in device_roles: 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] From 03b36058cdc265024b1e8b032d5071626ab33d5e Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Fri, 29 May 2020 10:08:07 +0200 Subject: [PATCH 2/2] Preparation for 0.24.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2094a10..48b91fd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.24.0 +0.24.1