netbox-plugin-dns 1.0.5__tar.gz → 1.0.7__tar.gz

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.0.5
+Version: 1.0.7
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/__init__.py

@@ -1,6 +1,6 @@
 from netbox.plugins import PluginConfig
 
-__version__ = "1.0.5"
+__version__ = "1.0.7"
 
 
 class DNSConfig(PluginConfig):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/api/nested_serializers.py

@@ -6,7 +6,7 @@ from netbox_dns.models import Zone, Record, ZoneTemplate, RecordTemplate
 from netbox_dns.api.serializers_.view import ViewSerializer
 
 
-__ALL__ = (
+__all__ = (
     "NestedZoneSerializer",
     "NestedRecordSerializer",
     "NestedZoneTemplateSerializer",
@@ -59,6 +59,22 @@ class NestedZoneSerializer(WritableNestedSerializer):
         ]
 
 
+class NestedZoneTemplateSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(
+        view_name="plugins-api:netbox_dns-api:zonetemplate-detail"
+    )
+
+    class Meta:
+        model = ZoneTemplate
+        fields = (
+            "id",
+            "url",
+            "name",
+            "display",
+            "description",
+        )
+
+
 class NestedRecordSerializer(WritableNestedSerializer):
     url = serializers.HyperlinkedIdentityField(
         view_name="plugins-api:netbox_dns-api:record-detail"
@@ -86,6 +102,7 @@ class NestedRecordSerializer(WritableNestedSerializer):
             "status",
             "ttl",
             "zone",
+            "managed",
             "active",
         ]
 
@@ -109,19 +126,3 @@ class NestedRecordTemplateSerializer(WritableNestedSerializer):
             "ttl",
             "description",
         )
-
-
-class NestedZoneTemplateSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(
-        view_name="plugins-api:netbox_dns-api:zonetemplate-detail"
-    )
-
-    class Meta:
-        model = ZoneTemplate
-        fields = (
-            "id",
-            "url",
-            "name",
-            "display",
-            "description",
-        )

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/api/serializers_/contact.py

@@ -5,7 +5,7 @@ from netbox.api.serializers import NetBoxModelSerializer
 from netbox_dns.models import Contact
 
 
-__ALL__ = ("ContactSerializer",)
+__all__ = ("ContactSerializer",)
 
 
 class ContactSerializer(NetBoxModelSerializer):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/api/serializers_/nameserver.py

@@ -8,7 +8,7 @@ from netbox_dns.models import NameServer
 from ..nested_serializers import NestedZoneSerializer
 
 
-__ALL__ = ("NameServerSerializer",)
+__all__ = ("NameServerSerializer",)
 
 
 class NameServerSerializer(NetBoxModelSerializer):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/api/serializers_/record.py

@@ -9,7 +9,7 @@ from netbox_dns.models import Record
 from ..nested_serializers import NestedZoneSerializer, NestedRecordSerializer
 
 
-__ALL__ = ("RecordSerializer",)
+__all__ = ("RecordSerializer",)
 
 
 class RecordSerializer(NetBoxModelSerializer):
@@ -87,5 +87,6 @@ class RecordSerializer(NetBoxModelSerializer):
             "status",
             "ttl",
             "description",
+            "managed",
             "active",
         )

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/api/serializers_/record_template.py

@@ -7,7 +7,8 @@ from netbox_dns.models import RecordTemplate
 
 from ..nested_serializers import NestedZoneTemplateSerializer
 
-__ALL__ = ("RecordTemplateSerializer",)
+
+__all__ = ("RecordTemplateSerializer",)
 
 
 class RecordTemplateSerializer(NetBoxModelSerializer):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/api/serializers_/registrar.py

@@ -5,7 +5,7 @@ from netbox.api.serializers import NetBoxModelSerializer
 from netbox_dns.models import Registrar
 
 
-__ALL__ = ("RegistrarSerializer",)
+__all__ = ("RegistrarSerializer",)
 
 
 class RegistrarSerializer(NetBoxModelSerializer):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/api/serializers_/view.py

@@ -6,7 +6,7 @@ from tenancy.api.serializers_.tenants import TenantSerializer
 from netbox_dns.models import View
 
 
-__ALL__ = ("ViewSerializer",)
+__all__ = ("ViewSerializer",)
 
 
 class ViewSerializer(NetBoxModelSerializer):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/api/serializers_/zone.py

@@ -13,7 +13,8 @@ from ..nested_serializers import NestedZoneSerializer
 
 from netbox_dns.models import Zone
 
-__ALL__ = ("NameServerSerializer",)
+
+__all__ = ("ZoneSerializer",)
 
 
 class ZoneSerializer(NetBoxModelSerializer):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/api/serializers_/zone_template.py

@@ -10,7 +10,8 @@ from .nameserver import NameServerSerializer
 from .registrar import RegistrarSerializer
 from .contact import ContactSerializer
 
-__ALL__ = ("ZoneTemplateSerializer",)
+
+__all__ = ("ZoneTemplateSerializer",)
 
 
 class ZoneTemplateSerializer(NetBoxModelSerializer):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/api/views.py

@@ -1,6 +1,4 @@
 from rest_framework import serializers
-from rest_framework.decorators import action
-from rest_framework.response import Response
 from rest_framework.routers import APIRootView
 
 from netbox.api.viewsets import NetBoxModelViewSet
@@ -47,12 +45,6 @@ class ViewViewSet(NetBoxModelViewSet):
     serializer_class = ViewSerializer
     filterset_class = ViewFilterSet
 
-    @action(detail=True, methods=["get"])
-    def views(self, request, pk=None):
-        views = View.objects.filter(zone=pk)
-        serializer = ViewSerializer(views, many=True, context={"request": request})
-        return Response(serializer.data)
-
 
 class ZoneViewSet(NetBoxModelViewSet):
     queryset = Zone.objects.prefetch_related(
@@ -66,32 +58,12 @@ class ZoneViewSet(NetBoxModelViewSet):
     serializer_class = ZoneSerializer
     filterset_class = ZoneFilterSet
 
-    @action(detail=True, methods=["get"])
-    def records(self, request, pk=None):
-        records = Record.objects.filter(zone=pk)
-        serializer = RecordSerializer(records, many=True, context={"request": request})
-        return Response(serializer.data)
-
-    @action(detail=True, methods=["get"])
-    def nameservers(self, request, pk=None):
-        nameservers = NameServer.objects.filter(zones__id=pk)
-        serializer = NameServerSerializer(
-            nameservers, many=True, context={"request": request}
-        )
-        return Response(serializer.data)
-
 
 class NameServerViewSet(NetBoxModelViewSet):
     queryset = NameServer.objects.prefetch_related("zones", "tenant")
     serializer_class = NameServerSerializer
     filterset_class = NameServerFilterSet
 
-    @action(detail=True, methods=["get"])
-    def zones(self, request, pk=None):
-        zones = Zone.objects.filter(nameservers__id=pk)
-        serializer = ZoneSerializer(zones, many=True, context={"request": request})
-        return Response(serializer.data)
-
 
 class RecordViewSet(NetBoxModelViewSet):
     queryset = Record.objects.all().prefetch_related("zone", "zone__view", "tenant")

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/choices/record.py

@@ -9,7 +9,7 @@ def initialize_choice_names(cls):
     return cls
 
 
-__ALL__ = (
+__all__ = (
     "RecordTypeChoices",
     "RecordClassChoices",
     "RecordStatusChoices",

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/choices/zone.py

@@ -1,7 +1,7 @@
 from utilities.choices import ChoiceSet
 
 
-__ALL__ = ("ZoneStatusChoices",)
+__all__ = ("ZoneStatusChoices",)
 
 
 class ZoneStatusChoices(ChoiceSet):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/fields/address.py

@@ -5,7 +5,7 @@ from django.core.exceptions import ValidationError
 from netaddr import AddrFormatError, IPAddress
 
 
-__ALL__ = (
+__all__ = (
     "AddressFormField",
     "AddressField",
 )

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/fields/network.py

@@ -6,7 +6,7 @@ from django.core.exceptions import ValidationError
 from netaddr import AddrFormatError, IPNetwork
 
 
-__ALL__ = ()
+__all__ = ("NetworkField",)
 
 
 class NetContains(Lookup):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/fields/rfc2317.py

@@ -10,7 +10,10 @@ from .network import NetContains, NetContained, NetOverlap, NetMaskLength
 INVALID_RFC2317 = "RFC2317 requires an IPv4 prefix with a length of at least 25 bits."
 
 
-__ALL__ = ()
+__all__ = (
+    "RFC2317NetworkField",
+    "RFC2317NetworkFormField",
+)
 
 
 class RFC2317NetworkFormField(forms.Field):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/filtersets/contact.py

@@ -5,7 +5,7 @@ from netbox.filtersets import NetBoxModelFilterSet
 from netbox_dns.models import Contact
 
 
-__ALL__ = ("ContactFilterSet",)
+__all__ = ("ContactFilterSet",)
 
 
 class ContactFilterSet(NetBoxModelFilterSet):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/filtersets/nameserver.py

@@ -7,7 +7,7 @@ from tenancy.filtersets import TenancyFilterSet
 from netbox_dns.models import NameServer, Zone
 
 
-__ALL__ = ("NameServerFilterSet",)
+__all__ = ("NameServerFilterSet",)
 
 
 class NameServerFilterSet(TenancyFilterSet, NetBoxModelFilterSet):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/filtersets/record.py

@@ -13,7 +13,7 @@ from netbox_dns.models import View, Zone, Record
 from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices
 
 
-__ALL__ = ("RecordFilterSet",)
+__all__ = ("RecordFilterSet",)
 
 
 class RecordFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
@@ -121,7 +121,7 @@ class RecordFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         if not value.strip():
             return queryset
         qs_filter = (
-            Q(name__icontains=value)
+            Q(fqdn__icontains=value)
             | Q(value__icontains=value)
             | Q(zone__name__icontains=value)
         )

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/filtersets/record_template.py

@@ -8,7 +8,7 @@ from netbox_dns.models import RecordTemplate, ZoneTemplate
 from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices
 
 
-__ALL__ = ("RecordTemplateFilterSet",)
+__all__ = ("RecordTemplateFilterSet",)
 
 
 class RecordTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/filtersets/registrar.py

@@ -5,7 +5,7 @@ from netbox.filtersets import NetBoxModelFilterSet
 from netbox_dns.models import Registrar
 
 
-__ALL__ = ("RegistrarFilterSet",)
+__all__ = ("RegistrarFilterSet",)
 
 
 class RegistrarFilterSet(NetBoxModelFilterSet):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/filtersets/view.py

@@ -6,7 +6,7 @@ from tenancy.filtersets import TenancyFilterSet
 from netbox_dns.models import View
 
 
-__ALL__ = ("ViewFilterSet",)
+__all__ = ("ViewFilterSet",)
 
 
 class ViewFilterSet(NetBoxModelFilterSet, TenancyFilterSet):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/filtersets/zone.py

@@ -11,7 +11,7 @@ from netbox_dns.models import View, Zone, Registrar, Contact, NameServer
 from netbox_dns.choices import ZoneStatusChoices
 
 
-__ALL__ = ("ZoneFilterSet",)
+__all__ = ("ZoneFilterSet",)
 
 
 class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/filtersets/zone_template.py

@@ -14,7 +14,7 @@ from netbox_dns.models import (
 )
 
 
-__ALL__ = ("ZoneTemplateFilterSet",)
+__all__ = ("ZoneTemplateFilterSet",)
 
 
 class ZoneTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/forms/contact.py

@@ -12,7 +12,7 @@ from utilities.forms.rendering import FieldSet
 from netbox_dns.models import Contact
 
 
-__ALL__ = (
+__all__ = (
     "ContactForm",
     "ContactFilterForm",
     "ContactImportForm",

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/forms/nameserver.py

@@ -11,16 +11,17 @@ from utilities.forms.fields import (
     TagFilterField,
     CSVModelChoiceField,
     DynamicModelChoiceField,
+    DynamicModelMultipleChoiceField,
 )
 from utilities.forms.rendering import FieldSet
 from tenancy.models import Tenant
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
-from netbox_dns.models import NameServer
+from netbox_dns.models import NameServer, Zone
 from netbox_dns.utilities import name_to_unicode
 
 
-__ALL__ = (
+__all__ = (
     "NameServerForm",
     "NameServerFilterForm",
     "NameServerImportForm",
@@ -50,6 +51,16 @@ class NameServerForm(TenancyForm, NetBoxModelForm):
 class NameServerFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = NameServer
 
+    zone_id = DynamicModelMultipleChoiceField(
+        queryset=Zone.objects.all(),
+        required=False,
+        label="Zones",
+    )
+    soa_zone_id = DynamicModelMultipleChoiceField(
+        queryset=Zone.objects.all(),
+        required=False,
+        label="SOA Zones",
+    )
     name = forms.CharField(
         required=False,
     )
@@ -60,7 +71,7 @@ class NameServerFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
 
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
-        FieldSet("name", "description", name="Attributes"),
+        FieldSet("name", "zone_id", "soa_zone_id", "description", name="Attributes"),
         FieldSet("tenant_group_id", "tenant_id", name="Tenancy"),
     )
 

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/forms/record.py

@@ -24,7 +24,7 @@ from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices
 from netbox_dns.utilities import name_to_unicode
 
 
-__ALL__ = (
+__all__ = (
     "RecordForm",
     "RecordFilterForm",
     "RecordImportForm",
@@ -60,7 +60,7 @@ class RecordForm(TenancyForm, NetBoxModelForm):
         label="Zone",
     )
 
-    disable_ptr = forms.NullBooleanField(
+    disable_ptr = forms.BooleanField(
         label="Disable PTR",
         required=False,
     )

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/forms/record_template.py

@@ -24,7 +24,7 @@ from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices
 from netbox_dns.utilities import name_to_unicode
 
 
-__ALL__ = (
+__all__ = (
     "RecordTemplateForm",
     "RecordTemplateFilterForm",
     "RecordTemplateImportForm",

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/forms/registrar.py

@@ -12,7 +12,7 @@ from utilities.forms.rendering import FieldSet
 from netbox_dns.models import Registrar
 
 
-__ALL__ = (
+__all__ = (
     "RegistrarForm",
     "RegistrarFilterForm",
     "RegistrarImportForm",

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/forms/view.py

@@ -19,7 +19,7 @@ from tenancy.forms import TenancyForm, TenancyFilterForm
 from netbox_dns.models import View
 
 
-__ALL__ = (
+__all__ = (
     "ViewForm",
     "ViewFilterForm",
     "ViewImportForm",

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/forms/zone.py

@@ -39,7 +39,7 @@ from netbox_dns.fields import RFC2317NetworkFormField
 from netbox_dns.validators import validate_ipv4, validate_prefix, validate_rfc2317
 
 
-__ALL__ = (
+__all__ = (
     "ZoneForm",
     "ZoneFilterForm",
     "ZoneImportForm",
@@ -81,6 +81,14 @@ class ZoneTemplateUpdateMixin:
                 else:
                     zone_data = self.cleaned_data.copy()
 
+                    custom_fields = dict()
+                    for key, value in zone_data.copy().items():
+                        if key.startswith("cf_"):
+                            custom_fields[key[3:]] = value
+                            zone_data.pop(key)
+                    if custom_fields:
+                        zone_data["custom_field_data"] = custom_fields
+
                     zone_data.pop("template", None)
                     zone_data.pop("tenant_group", None)
                     zone_data.pop("_init_time", None)
@@ -261,9 +269,6 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         if self.initial.get("soa_ttl") is None:
             self.initial["soa_ttl"] = self.initial.get("default_ttl")
 
-        if self.initial.get("soa_serial_auto"):
-            self.initial["soa_serial"] = None
-
         if self.initial.get("soa_mname") is None:
             default_soa_mname = defaults.get("zone_soa_mname")
             if default_soa_mname is not None:
@@ -330,7 +335,12 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
         FieldSet(
-            "view_id", "status", "name", "nameservers", "description", name="Attributes"
+            "view_id",
+            "status",
+            "name",
+            "nameserver_id",
+            "description",
+            name="Attributes",
         ),
         FieldSet(
             "soa_mname_id",
@@ -368,9 +378,10 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     name = forms.CharField(
         required=False,
     )
-    nameservers = DynamicModelMultipleChoiceField(
+    nameserver_id = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
+        label="Nameservers",
     )
     description = forms.CharField(
         required=False,

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/forms/zone_template.py

@@ -26,7 +26,7 @@ from netbox_dns.models import (
 )
 
 
-__ALL__ = (
+__all__ = (
     "ZoneTemplateForm",
     "ZoneTemplateFilterForm",
     "ZoneTemplateImportForm",

{netbox_plugin_dns-1.0.5 → netbox_plugin_dns-1.0.7}/netbox_dns/graphql/schema.py

@@ -25,79 +25,55 @@ from .types import (
 )
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSNameServerQuery:
-    @strawberry.field
-    def netbox_dns_nameserver(self, id: int) -> NetBoxDNSNameServerType:
-        return NameServer.objects.get(pk=id)
-
+    netbox_dns_nameserver: NetBoxDNSNameServerType = strawberry_django.field()
     netbox_dns_nameserver_list: List[NetBoxDNSNameServerType] = (
         strawberry_django.field()
     )
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSViewQuery:
-    @strawberry.field
-    def netbox_dns_view(self, id: int) -> NetBoxDNSViewType:
-        return View.objects.get(pk=id)
-
+    netbox_dns_view: NetBoxDNSViewType = strawberry_django.field()
     netbox_dns_view_list: List[NetBoxDNSViewType] = strawberry_django.field()
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSZoneQuery:
-    @strawberry.field
-    def netbox_dns_zone(self, id: int) -> NetBoxDNSZoneType:
-        return Zone.objects.get(pk=id)
-
+    netbox_dns_zone: NetBoxDNSZoneType = strawberry_django.field()
     netbox_dns_zone_list: List[NetBoxDNSZoneType] = strawberry_django.field()
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSRecordQuery:
-    @strawberry.field
-    def netbox_dns_record(self, id: int) -> NetBoxDNSRecordType:
-        return Record.objects.get(pk=id)
-
+    netbox_dns_record: NetBoxDNSRecordType = strawberry_django.field()
     netbox_dns_record_list: List[NetBoxDNSRecordType] = strawberry_django.field()
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSContactQuery:
-    @strawberry.field
-    def netbox_dns_contact(self, id: int) -> NetBoxDNSContactType:
-        return Contact.objects.get(pk=id)
-
+    netbox_dns_contact: NetBoxDNSContactType = strawberry_django.field()
     netbox_dns_contact_list: List[NetBoxDNSContactType] = strawberry_django.field()
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSRegistrarQuery:
-    @strawberry.field
-    def netbox_dns_registrar(self, id: int) -> NetBoxDNSRegistrarType:
-        return Registrar.objects.get(pk=id)
-
+    netbox_dns_registrar: NetBoxDNSRegistrarType = strawberry_django.field()
     netbox_dns_registrar_list: List[NetBoxDNSRegistrarType] = strawberry_django.field()
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSZoneTemplateQuery:
-    @strawberry.field
-    def netbox_dns_zone_template(self, id: int) -> NetBoxDNSZoneTemplateType:
-        return ZoneTemplate.objects.get(pk=id)
-
+    netbox_dns_zone_template: NetBoxDNSZoneTemplateType = strawberry_django.field()
     netbox_dns_zone_template_list: List[NetBoxDNSZoneTemplateType] = (
         strawberry_django.field()
     )
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSRecordTemplateQuery:
-    @strawberry.field
-    def netbox_dns_record_template(self, id: int) -> NetBoxDNSRecordTemplateType:
-        return RecordTemplate.objects.get(pk=id)
-
+    netbox_dns_record_template: NetBoxDNSRecordTemplateType = strawberry_django.field()
     netbox_dns_record_template_list: List[NetBoxDNSRecordTemplateType] = (
         strawberry_django.field()
     )

netbox_plugin_dns-1.0.7/netbox_dns/migrations/0007_alter_ordering_options.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.0.7 on 2024-08-27 09:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0006_templating"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="record",
+            options={"ordering": ("fqdn", "zone", "name", "type", "value", "status")},
+        ),
+        migrations.AlterModelOptions(
+            name="recordtemplate",
+            options={"ordering": ("name",)},
+        ),
+        migrations.AlterModelOptions(
+            name="zonetemplate",
+            options={"ordering": ("name",)},
+        ),
+    ]