netbox-plugin-dns 0.22.9__py3-none-any.whl → 1.0b1__py3-none-any.whl

netbox_dns/forms/contact.py

@@ -7,15 +7,38 @@ from netbox.forms import (
     NetBoxModelForm,
 )
 from utilities.forms.fields import TagFilterField
+from utilities.forms.rendering import FieldSet
 
 from netbox_dns.models import Contact
 
 
 class ContactForm(NetBoxModelForm):
+    fieldsets = (
+        FieldSet(
+            "name",
+            "description",
+            "contact_id",
+            "organization",
+            "street",
+            "city",
+            "state_province",
+            "postal_code",
+            "country",
+            "phone",
+            "phone_ext",
+            "fax",
+            "fax_ext",
+            "email",
+            name="Contact",
+        ),
+        FieldSet("tags", name="Tags"),
+    )
+
     class Meta:
         model = Contact
         fields = (
             "name",
+            "description",
             "contact_id",
             "organization",
             "street",
@@ -34,25 +57,28 @@ class ContactForm(NetBoxModelForm):
 
 class ContactFilterForm(NetBoxModelFilterSetForm):
     model = Contact
+
     fieldsets = (
-        (None, ("q", "name", "tags", "contact_id")),
-        (
-            "Address",
-            (
-                "organization",
-                "street",
-                "city",
-                "state_province",
-                "postal_code",
-                "country",
-            ),
+        FieldSet("q", "filter_id", "tag"),
+        FieldSet("name", "contact_id", "description", name="Attributes"),
+        FieldSet(
+            "organization",
+            "street",
+            "city",
+            "state_province",
+            "postal_code",
+            "country",
+            name="Address",
         ),
-        ("Communication", ("phone", "phone_ext", "fax", "fax_ext", "email")),
+        FieldSet("phone", "phone_ext", "fax", "fax_ext", "email", name="Communication"),
     )
 
     name = forms.CharField(
         required=False,
     )
+    description = forms.CharField(
+        required=False,
+    )
     contact_id = forms.CharField(
         required=False,
         label="Contact ID",
@@ -94,7 +120,7 @@ class ContactFilterForm(NetBoxModelFilterSetForm):
     email = forms.CharField(
         required=False,
     )
-    tags = TagFilterField(Contact)
+    tag = TagFilterField(Contact)
 
 
 class ContactImportForm(NetBoxModelImportForm):
@@ -102,6 +128,7 @@ class ContactImportForm(NetBoxModelImportForm):
         model = Contact
         fields = (
             "name",
+            "description",
             "contact_id",
             "organization",
             "street",
@@ -125,6 +152,10 @@ class ContactBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label="Name",
     )
+    description = forms.CharField(
+        required=False,
+        label="Description",
+    )
     organization = forms.CharField(
         required=False,
         label="Organization",
@@ -171,32 +202,29 @@ class ContactBulkEditForm(NetBoxModelBulkEditForm):
     )
 
     fieldsets = (
-        (None, ("name",)),
-        (
-            "Address",
-            (
-                "organization",
-                "street",
-                "city",
-                "state_province",
-                "postal_code",
-                "country",
-            ),
+        FieldSet("name", "description", name="Attributes"),
+        FieldSet(
+            "organization",
+            "street",
+            "city",
+            "state_province",
+            "postal_code",
+            "country",
+            name="Address",
         ),
-        (
-            "Communication",
-            (
-                "phone",
-                "phone_ext",
-                "fax",
-                "fax_ext",
-                "email",
-            ),
+        FieldSet(
+            "phone",
+            "phone_ext",
+            "fax",
+            "fax_ext",
+            "email",
+            name="Communication",
         ),
     )
 
     nullable_fields = (
         "name",
+        "description",
         "organization",
         "street",
         "city",

netbox_dns/forms/nameserver.py

@@ -12,6 +12,7 @@ from utilities.forms.fields import (
     CSVModelChoiceField,
     DynamicModelChoiceField,
 )
+from utilities.forms.rendering import FieldSet
 from tenancy.models import Tenant
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
@@ -28,8 +29,9 @@ class NameServerForm(TenancyForm, NetBoxModelForm):
             self.initial["name"] = name_to_unicode(initial_name)
 
     fieldsets = (
-        ("Nameserver", ("name", "description", "tags")),
-        ("Tenancy", ("tenant_group", "tenant")),
+        FieldSet("name", "description", name="Nameserver"),
+        FieldSet("tenant_group", "tenant", name="Tenancy"),
+        FieldSet("tags", name="Tags"),
     )
 
     class Meta:
@@ -42,14 +44,16 @@ class NameServerFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
 
     name = forms.CharField(
         required=False,
-        label="Name",
+    )
+    description = forms.CharField(
+        required=False,
     )
     tag = TagFilterField(NameServer)
 
     fieldsets = (
-        (None, ("q", "filter_id", "tag")),
-        ("Attributes", ("name",)),
-        ("Tenant", ("tenant_group_id", "tenant_id")),
+        FieldSet("q", "filter_id", "tag"),
+        FieldSet("name", "description", name="Attributes"),
+        FieldSet("tenant_group_id", "tenant_id", name="Tenancy"),
     )
 
 
@@ -78,5 +82,14 @@ class NameServerBulkEditForm(NetBoxModelBulkEditForm):
     description = forms.CharField(max_length=200, required=False)
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
 
-    class Meta:
-        nullable_fields = ("description", "tenant")
+    fieldsets = (
+        FieldSet(
+            "name",
+            "description",
+            "tenant",
+            "tags",
+            name="Attributes",
+        ),
+    )
+
+    nullable_fields = ("description", "tenant")

netbox_dns/forms/record.py

@@ -16,6 +16,7 @@ from utilities.forms.fields import (
 )
 from utilities.forms.widgets import BulkEditNullBooleanSelect, APISelect
 from utilities.forms import add_blank_choice
+from utilities.forms.rendering import FieldSet
 from tenancy.models import Tenant
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
@@ -41,21 +42,19 @@ class RecordForm(TenancyForm, NetBoxModelForm):
     )
 
     fieldsets = (
-        (
-            "Record",
-            (
-                "name",
-                "zone",
-                "type",
-                "value",
-                "status",
-                "ttl",
-                "disable_ptr",
-                "description",
-                "tags",
-            ),
+        FieldSet(
+            "name",
+            "zone",
+            "type",
+            "value",
+            "status",
+            "ttl",
+            "disable_ptr",
+            "description",
+            name="Record",
         ),
-        ("Tenancy", ("tenant_group", "tenant")),
+        FieldSet("tenant_group", "tenant", name="Tenancy"),
+        FieldSet("tags", name="Tags"),
     )
 
     class Meta:
@@ -78,12 +77,18 @@ class RecordForm(TenancyForm, NetBoxModelForm):
 class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = Record
     fieldsets = (
-        (None, ("q", "filter_id", "tag")),
-        (
-            "Attributes",
-            ("view_id", "zone_id", "name", "fqdn", "type", "value", "status"),
+        FieldSet("q", "filter_id", "tag"),
+        FieldSet(
+            "zone_id",
+            "name",
+            "fqdn",
+            "type",
+            "value",
+            "status",
+            "description",
+            name="Attributes",
         ),
-        ("Tenant", ("tenant_group_id", "tenant_id")),
+        FieldSet("tenant_group_id", "tenant_id", name="Tenancy"),
     )
 
     type = forms.MultipleChoiceField(
@@ -92,7 +97,6 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     )
     name = forms.CharField(
         required=False,
-        label="Name",
     )
     fqdn = forms.CharField(
         required=False,
@@ -100,7 +104,6 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     )
     value = forms.CharField(
         required=False,
-        label="Value",
     )
     status = forms.MultipleChoiceField(
         choices=RecordStatusChoices,
@@ -111,10 +114,8 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label="Zone",
     )
-    view_id = DynamicModelMultipleChoiceField(
-        queryset=View.objects.all(),
+    description = forms.CharField(
         required=False,
-        label="View",
     )
     tag = TagFilterField(Record)
 
@@ -231,18 +232,16 @@ class RecordBulkEditForm(NetBoxModelBulkEditForm):
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
 
     fieldsets = (
-        (
-            None,
-            (
-                "zone",
-                "type",
-                "value",
-                "status",
-                "ttl",
-                "disable_ptr",
-                "description",
-                "tenant",
-            ),
+        FieldSet(
+            "zone",
+            "type",
+            "value",
+            "status",
+            "ttl",
+            "disable_ptr",
+            "description",
+            name="Attributes",
         ),
+        FieldSet("tenant_group", "tenant", name="Tenancy"),
     )
     nullable_fields = ("description", "ttl", "tenant")

netbox_dns/forms/registrar.py

@@ -7,6 +7,7 @@ from netbox.forms import (
     NetBoxModelForm,
 )
 from utilities.forms.fields import TagFilterField
+from utilities.forms.rendering import FieldSet
 
 from netbox_dns.models import Registrar
 
@@ -14,9 +15,24 @@ from netbox_dns.models import Registrar
 class RegistrarForm(NetBoxModelForm):
     class Meta:
         model = Registrar
+        fieldsets = (
+            FieldSet(
+                "name",
+                "iana_id",
+                "description",
+                "address",
+                "referral_url",
+                "whois_server",
+                "abuse_email",
+                "abuse_phone",
+                name="Registrar",
+            ),
+            FieldSet("tags", name="Tags"),
+        )
         fields = (
             "name",
             "iana_id",
+            "description",
             "address",
             "referral_url",
             "whois_server",
@@ -29,10 +45,15 @@ class RegistrarForm(NetBoxModelForm):
 class RegistrarFilterForm(NetBoxModelFilterSetForm):
     model = Registrar
     fieldsets = (
-        (None, ("q", "name", "iana_id", "tags")),
-        (
-            "Contact",
-            ("address", "referral_url", "whois_server", "abuse_email", "abuse_phone"),
+        FieldSet("q", "filter_id", "tag"),
+        FieldSet("name", "iana_id", "description", name="Attributes"),
+        FieldSet(
+            "address",
+            "referral_url",
+            "whois_server",
+            "abuse_email",
+            "abuse_phone",
+            name="Contact",
         ),
     )
 
@@ -42,6 +63,9 @@ class RegistrarFilterForm(NetBoxModelFilterSetForm):
     address = forms.CharField(
         required=False,
     )
+    description = forms.CharField(
+        required=False,
+    )
     iana_id = forms.IntegerField(
         required=False,
         label="IANA ID",
@@ -62,7 +86,7 @@ class RegistrarFilterForm(NetBoxModelFilterSetForm):
         required=False,
         label="Abuse Phone",
     )
-    tags = TagFilterField(Registrar)
+    tag = TagFilterField(Registrar)
 
 
 class RegistrarImportForm(NetBoxModelImportForm):
@@ -71,6 +95,7 @@ class RegistrarImportForm(NetBoxModelImportForm):
         fields = (
             "name",
             "iana_id",
+            "description",
             "address",
             "referral_url",
             "whois_server",
@@ -87,8 +112,13 @@ class RegistrarBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label="IANA ID",
     )
+    description = forms.CharField(
+        required=False,
+        label="Description",
+    )
     address = forms.CharField(
         required=False,
+        label="Address",
     )
     referral_url = forms.CharField(
         required=False,
@@ -108,21 +138,21 @@ class RegistrarBulkEditForm(NetBoxModelBulkEditForm):
     )
 
     fieldsets = (
-        (
-            None,
-            (
-                "iana_id",
-                "address",
-                "referral_url",
-                "whois_server",
-                "abuse_email",
-                "abuse_phone",
-            ),
+        FieldSet(
+            "iana_id",
+            "description",
+            "address",
+            "referral_url",
+            "whois_server",
+            "abuse_email",
+            "abuse_phone",
+            name="Attributes",
         ),
     )
 
     nullable_fields = (
         "iana_id",
+        "description",
         "address",
         "referral_url",
         "whois_server",

netbox_dns/forms/view.py

@@ -11,6 +11,7 @@ from utilities.forms.fields import (
     CSVModelChoiceField,
     DynamicModelChoiceField,
 )
+from utilities.forms.rendering import FieldSet
 from tenancy.models import Tenant
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
@@ -19,8 +20,8 @@ from netbox_dns.models import View
 
 class ViewForm(TenancyForm, NetBoxModelForm):
     fieldsets = (
-        ("View", ("name", "description", "tags")),
-        ("Tenancy", ("tenant_group", "tenant")),
+        FieldSet("name", "description", "tags", name="View"),
+        FieldSet("tenant_group", "tenant", name="Tenancy"),
     )
 
     class Meta:
@@ -31,14 +32,16 @@ class ViewForm(TenancyForm, NetBoxModelForm):
 class ViewFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = View
     fieldsets = (
-        (None, ("q", "filter_id", "tag")),
-        ("Attributes", ("name",)),
-        ("Tenant", ("tenant_group_id", "tenant_id")),
+        FieldSet("q", "filter_id", "tag"),
+        FieldSet("name", "description", name="Attributes"),
+        FieldSet("tenant_group_id", "tenant_id", name="Tenancy"),
     )
 
     name = forms.CharField(
         required=False,
-        label="Name",
+    )
+    description = forms.CharField(
+        required=False,
     )
     tag = TagFilterField(View)
 
@@ -62,5 +65,13 @@ class ViewBulkEditForm(NetBoxModelBulkEditForm):
     description = forms.CharField(max_length=200, required=False)
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
 
-    class Meta:
-        nullable_fields = ("description", "tenant")
+    fieldsets = (
+        FieldSet(
+            "name",
+            "description",
+            name="Attributes",
+        ),
+        FieldSet("tenant", name="Tenancy"),
+    )
+
+    nullable_fields = ("description", "tenant")