Skip to content

Commit cc2d6ff

Browse files
authored
Merge pull request #792 from sys4/fix/netbox-4.5-compatibility
Implemented workaround to restore compatibility with NetBox 4.5.0-4.5.3
2 parents a45495c + 17e7891 commit cc2d6ff

File tree

11 files changed

+56
-11
lines changed

11 files changed

+56
-11
lines changed

netbox_dns/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class DNSConfig(PluginConfig):
1616
name = "netbox_dns"
1717
verbose_name = _("NetBox DNS")
1818
description = _("NetBox plugin for DNS data")
19-
min_version = "4.5.4"
19+
min_version = "4.5.0"
2020
version = __version__
2121
author = "Peter Eckel, sys4 AG"
2222
author_email = "pe@sys4.de"

netbox_dns/graphql/filters/dnssec_key_template.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
import strawberry
44
import strawberry_django
55
from strawberry.scalars import ID
6-
from strawberry_django import StrFilterLookup
6+
7+
try:
8+
from strawberry_django import StrFilterLookup
9+
except ImportError:
10+
from strawberry_django import FilterLookup as StrFilterLookup
711

812
from netbox.graphql.filters import PrimaryModelFilter
913
from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin

netbox_dns/graphql/filters/dnssec_policy.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
import strawberry
44
import strawberry_django
5-
from strawberry_django import FilterLookup, StrFilterLookup
5+
from strawberry_django import FilterLookup
6+
7+
try:
8+
from strawberry_django import StrFilterLookup
9+
except ImportError:
10+
from strawberry_django import FilterLookup as StrFilterLookup
611

712
from netbox.graphql.filters import PrimaryModelFilter
813
from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin

netbox_dns/graphql/filters/nameserver.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
import strawberry
44
import strawberry_django
5-
from strawberry_django import StrFilterLookup
5+
6+
try:
7+
from strawberry_django import StrFilterLookup
8+
except ImportError:
9+
from strawberry_django import FilterLookup as StrFilterLookup
610

711
from netbox.graphql.filters import PrimaryModelFilter
812
from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin

netbox_dns/graphql/filters/record.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
import strawberry
44
import strawberry_django
55
from strawberry.scalars import ID
6-
from strawberry_django import FilterLookup, StrFilterLookup
6+
from strawberry_django import FilterLookup
7+
8+
try:
9+
from strawberry_django import StrFilterLookup
10+
except ImportError:
11+
from strawberry_django import FilterLookup as StrFilterLookup
712

813
from netbox.graphql.filters import PrimaryModelFilter
914
from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin

netbox_dns/graphql/filters/record_template.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
import strawberry
44
import strawberry_django
5-
from strawberry_django import FilterLookup, StrFilterLookup
5+
from strawberry_django import FilterLookup
6+
7+
try:
8+
from strawberry_django import StrFilterLookup
9+
except ImportError:
10+
from strawberry_django import FilterLookup as StrFilterLookup
611

712
from netbox.graphql.filters import PrimaryModelFilter
813
from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin

netbox_dns/graphql/filters/registrar.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
import strawberry
44
import strawberry_django
5-
from strawberry_django import StrFilterLookup
5+
6+
try:
7+
from strawberry_django import StrFilterLookup
8+
except ImportError:
9+
from strawberry_django import FilterLookup as StrFilterLookup
610

711
from netbox.graphql.filters import PrimaryModelFilter
812

netbox_dns/graphql/filters/registration_contact.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import strawberry_django
2-
from strawberry_django import StrFilterLookup
2+
3+
try:
4+
from strawberry_django import StrFilterLookup
5+
except ImportError:
6+
from strawberry_django import FilterLookup as StrFilterLookup
37

48
from netbox.graphql.filters import PrimaryModelFilter
59

netbox_dns/graphql/filters/view.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
import strawberry
44
import strawberry_django
5-
from strawberry_django import FilterLookup, StrFilterLookup
5+
from strawberry_django import FilterLookup
6+
7+
try:
8+
from strawberry_django import StrFilterLookup
9+
except ImportError:
10+
from strawberry_django import FilterLookup as StrFilterLookup
611

712
from netbox.graphql.filters import PrimaryModelFilter
813
from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin

netbox_dns/graphql/filters/zone.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
import strawberry
44
import strawberry_django
55
from strawberry.scalars import ID
6-
from strawberry_django import FilterLookup, StrFilterLookup
6+
from strawberry_django import FilterLookup
7+
8+
try:
9+
from strawberry_django import StrFilterLookup
10+
except ImportError:
11+
from strawberry_django import FilterLookup as StrFilterLookup
712

813
from netbox.graphql.filters import PrimaryModelFilter
914
from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin

0 commit comments

Comments
 (0)