Skip to content

Commit e41859e

Browse files
committed
Fix Locations filter backward compatibility
1 parent 51f81f2 commit e41859e

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

nextbox_ui_plugin/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class NextBoxUIConfig(PluginConfig):
44
name = 'nextbox_ui_plugin'
55
verbose_name = 'NextBox UI'
66
description = 'A topology visualization plugin for Netbox powered by NextUI Toolkit.'
7-
version = '0.8.1'
7+
version = '0.8.2'
88
author = 'Igor Korotchenkov'
99
author_email = 'iDebugAll@gmail.com'
1010
base_url = 'nextbox-ui'

nextbox_ui_plugin/filters.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
import django_filters
2-
from dcim.models import Device, Location, Site, Region
2+
from dcim.models import Device, Site, Region
3+
from django.conf import settings
4+
from packaging import version
5+
6+
NETBOX_CURRENT_VERSION = version.parse(settings.VERSION)
7+
8+
if NETBOX_CURRENT_VERSION >= version.parse("2.11.0"):
9+
from dcim.models import Location
10+
else:
11+
from dcim.models import RackGroup as Location
312

413

514
class TopologyFilterSet(django_filters.FilterSet):

nextbox_ui_plugin/forms.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,16 @@
33
BootstrapMixin, DynamicModelMultipleChoiceField,
44
)
55
from .models import SavedTopology
6-
from dcim.models import Device, Location, Site, Region
6+
from dcim.models import Device, Site, Region
7+
from django.conf import settings
8+
from packaging import version
9+
10+
NETBOX_CURRENT_VERSION = version.parse(settings.VERSION)
11+
12+
if NETBOX_CURRENT_VERSION >= version.parse("2.11.0"):
13+
from dcim.models import Location
14+
else:
15+
from dcim.models import RackGroup as Location
716

817

918
class TopologyFilterForm(BootstrapMixin, forms.Form):

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
setup(
99
name='nextbox_ui_plugin',
10-
version='0.8.1',
10+
version='0.8.2',
1111
url='https://github.com/iDebugAll/nextbox-ui-plugin',
12-
download_url='https://github.com/iDebugAll/nextbox-ui-plugin/archive/v0.8.1.tar.gz',
12+
download_url='https://github.com/iDebugAll/nextbox-ui-plugin/archive/v0.8.2.tar.gz',
1313
description='A topology visualization plugin for Netbox powered by NextUI Toolkit.',
1414
long_description=long_description,
1515
long_description_content_type='text/markdown',

0 commit comments

Comments
 (0)