Fixes issue with fieldsets (#25)

* Update readme

* Version bump

* Fix fieldsets

netbox_routing/__init__.py

@@ -13,7 +13,7 @@ class NetboxRouting(PluginConfig):
     author = plugin.get('Author')
     author_email = plugin.get('Author-email')
     base_url = 'routing'
-    min_version = '3.5.0'
+    min_version = '4.1.0'
     required_settings = []
     caching_config = {}
     default_settings = {}

netbox_routing/forms/bgp.py

@@ -19,6 +19,8 @@
     'BGPSettingForm',
 )
 
+from utilities.forms.rendering import FieldSet
+
 
 class BGPSettingMixin:
     def __init__(self, *args, **kwargs):
@@ -162,11 +164,9 @@ class BGPRouterForm(BGPSettingMixin, NetBoxModelForm):
     )
 
 
-    fieldsets = [
-        (_('Router'), (
-            'device', 'asn',
-        )),
-    ]
+    fieldsets = (
+        FieldSet('device', 'asn', name=_('Router')),
+    )
 
     class Meta:
         model = BGPRouter
@@ -191,11 +191,9 @@ class BGPScopeForm(BGPSettingMixin, NetBoxModelForm):
     )
 
 
-    fieldsets = [
-        (_('Scope'), (
-            'router', 'vrf',
-        )),
-    ]
+    fieldsets = (
+        FieldSet('router', 'vrf', name=_('Scope')),
+    )
 
     class Meta:
         model = BGPScope
@@ -219,11 +217,9 @@ class BGPAddressFamilyForm(BGPSettingMixin, NetBoxModelForm):
     )
 
 
-    fieldsets = [
-        (_('Address Family'), (
-            'scope', 'address_family',
-        )),
-    ]
+    fieldsets = (
+        FieldSet('scope', 'address_family', name=_('Address Family')),
+    )
 
     class Meta:
         model = BGPAddressFamily
@@ -245,11 +241,9 @@ class BGPSettingForm(NetBoxModelForm):
     )
 
 
-    fieldsets = [
-        (_('Settings'), (
-            'key', 'value',
-        )),
-    ]
+    fieldsets = (
+        FieldSet('key', 'value', name=_('Settings')),
+    )
 
     class Meta:
         model = BGPSetting

netbox_routing/forms/bulk_edit/objects.py

@@ -11,6 +11,8 @@
     'RouteMapEntryBulkEditForm'
 )
 
+from utilities.forms.rendering import FieldSet
+
 
 class PrefixListEntryBulkEditForm(NetBoxModelBulkEditForm):
     prefix_list = DynamicModelChoiceField(
@@ -22,7 +24,7 @@ class PrefixListEntryBulkEditForm(NetBoxModelBulkEditForm):
 
     model = PrefixListEntry
     fieldsets = (
-        (None, ('prefix_list', )),
+       FieldSet('prefix_list'),
     )
     nullable_fields = ()
 
@@ -37,6 +39,6 @@ class RouteMapEntryBulkEditForm(NetBoxModelBulkEditForm):
 
     model = RouteMapEntry
     fieldsets = (
-        (None, ('route_map', )),
+       FieldSet('route_map'),
     )
     nullable_fields = ()

netbox_routing/forms/filtersets/bgp.py

@@ -16,6 +16,8 @@
     'BGPSettingFilterForm',
 )
 
+from utilities.forms.rendering import FieldSet
+
 
 class BGPRouterFilterForm(NetBoxModelFilterSetForm):
     device_id = DynamicModelMultipleChoiceField(
@@ -32,7 +34,7 @@ class BGPRouterFilterForm(NetBoxModelFilterSetForm):
     )
     model = BGPRouter
     fieldsets = (
-        (None, ('q', 'filter_id', 'tag', 'device_id', 'asn_id')),
+       FieldSet('q', 'filter_id', 'tag', 'device_id', 'asn_id'),
     )
     tag = TagFilterField(model)
 
@@ -52,7 +54,7 @@ class BGPScopeFilterForm(NetBoxModelFilterSetForm):
     )
     model = BGPScope
     fieldsets = (
-        (None, ('q', 'filter_id', 'tag', 'router_id', 'vrf_id')),
+       FieldSet('q', 'filter_id', 'tag', 'router_id', 'vrf_id'),
     )
     tag = TagFilterField(model)
 
@@ -71,14 +73,14 @@ class BGPAddressFamilyFilterForm(NetBoxModelFilterSetForm):
     )
     model = BGPAddressFamily
     fieldsets = (
-        (None, ('q', 'filter_id', 'tag', 'scope_id', 'address_family')),
+       FieldSet('q', 'filter_id', 'tag', 'scope_id', 'address_family'),
     )
     tag = TagFilterField(model)
 
 
 class BGPSettingFilterForm(NetBoxModelFilterSetForm):
     model = BGPSetting
     fieldsets = (
-        (None, ('q', 'filter_id', 'tag', )),
+       FieldSet('q', 'filter_id', 'tag'),
     )
     tag = TagFilterField(model)

netbox_routing/forms/filtersets/ospf.py

@@ -16,6 +16,8 @@
     'OSPFInterfaceFilterForm',
 )
 
+from utilities.forms.rendering import FieldSet
+
 
 class OSPFInstanceFilterForm(NetBoxModelFilterSetForm):
     device = DynamicModelMultipleChoiceField(
@@ -26,26 +28,26 @@ class OSPFInstanceFilterForm(NetBoxModelFilterSetForm):
     )
     model = OSPFInstance
     fieldsets = (
-        (None, ('q', 'filter_id', 'tag', 'device')),
+        FieldSet('q', 'filter_id', 'tag', 'device'),
     )
     tag = TagFilterField(model)
 
 
 class OSPFAreaFilterForm(NetBoxModelFilterSetForm):
     model = OSPFArea
     fieldsets = (
-        (None, ('q', 'filter_id', 'tag', )),
+        FieldSet('q', 'filter_id', 'tag'),
     )
     tag = TagFilterField(model)
 
 
 class OSPFInterfaceFilterForm(NetBoxModelFilterSetForm):
     model = OSPFInterface
     fieldsets = (
-        (None, ('q', 'filter_id', 'tag', )),
-        ('OSPF', ('instance', 'area')),
-        ('Device', ('interface', )),
-        ('Attributes', ('priority', 'bfd', 'authentication')),
+        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('instance', 'area', name=_('OSPF')),
+        FieldSet('interface', name=_('Device')),
+        FieldSet('priority', 'bfd', 'authentication', name=_('Attributes'))
     )
     instance = DynamicModelMultipleChoiceField(
         queryset=OSPFInstance.objects.all(),

netbox_routing/forms/filtersets/static.py

@@ -4,11 +4,13 @@
 from utilities.forms.fields import DynamicModelMultipleChoiceField, TagFilterField
 from django.utils.translation import gettext as _
 
+from utilities.forms.rendering import FieldSet
+
 
 class StaticRouteFilterForm(NetBoxModelFilterSetForm):
     model = StaticRoute
     fieldsets = (
-        (None, ('q', 'filter_id', 'tag', 'vrf')),
+        FieldSet('q', 'filter_id', 'tag', 'vrf'),
     )
     vrf = DynamicModelMultipleChoiceField(
         queryset=VRF.objects.all(),

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='netbox-routing',
-    version='0.2.0',
+    version='0.2.1',
     description='NetBox Routing',
     long_description='Plugin for documentation of routing configuration and objects',
     url='https://github.com/dansheps/netbox-routing/',