Render SoftwareProduct manufacturer consistently (#59)

Closes #58

Signed-off-by: wkoot <3715211+wkoot@users.noreply.github.com>

netbox_slm/forms/software_license.py

@@ -74,7 +74,14 @@ class SoftwareLicenseFilterForm(NetBoxModelFilterSetForm):
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
         FieldSet(
-            "name", "description", "type", "stored_location", "support", "software_product", "version", "installation"
+            "name",
+            "description",
+            "type",
+            "stored_location",
+            "support",
+            "software_product_id",
+            "version_id",
+            "installation_id",
         ),
     )
     selector_fields = ("q", "filter_id", "name")
@@ -87,18 +94,20 @@ class SoftwareLicenseFilterForm(NetBoxModelFilterSetForm):
     stored_location = CharField(required=False)
     support = ChoiceField(required=False, choices=BOOLEAN_WITH_BLANK_CHOICES)
 
-    software_product = DynamicModelMultipleChoiceField(
+    software_product_id = DynamicModelMultipleChoiceField(
         queryset=SoftwareProduct.objects.all(),
         required=False,
         label="Software Product",
     )
-    version = DynamicModelMultipleChoiceField(
+    version_id = DynamicModelMultipleChoiceField(
         queryset=SoftwareProductVersion.objects.all(),
         required=False,
+        label="Version",
     )
-    installation = DynamicModelMultipleChoiceField(
+    installation_id = DynamicModelMultipleChoiceField(
         queryset=SoftwareProductInstallation.objects.all(),
         required=False,
+        label="Installation",
     )
 
 

netbox_slm/forms/software_product.py

@@ -37,7 +37,7 @@ class SoftwareProductFilterForm(NetBoxModelFilterSetForm):
     model = SoftwareProduct
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
-        FieldSet("name", "description", "manufacturer"),
+        FieldSet("name", "description", "manufacturer_id"),
     )
     selector_fields = ("q", "filter_id", "name")
 
@@ -45,9 +45,10 @@ class SoftwareProductFilterForm(NetBoxModelFilterSetForm):
 
     name = CharField(required=False)
     description = CharField(required=False)
-    manufacturer = DynamicModelMultipleChoiceField(
+    manufacturer_id = DynamicModelMultipleChoiceField(
         queryset=Manufacturer.objects.all(),
         required=False,
+        label="Manufacturer",
     )
 
 

netbox_slm/forms/software_product_installation.py

@@ -69,33 +69,36 @@ class SoftwareProductInstallationFilterForm(NetBoxModelFilterSetForm):
     model = SoftwareProductInstallation
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
-        FieldSet("device", "virtualmachine", "cluster", "software_product", "version"),
+        FieldSet("device_id", "virtualmachine_id", "cluster_id", "software_product_id", "version_id"),
     )
     selector_fields = ("filter_id", "q")
 
     tag = TagFilterField(model)
 
-    device = DynamicModelMultipleChoiceField(
+    device_id = DynamicModelMultipleChoiceField(
         queryset=Device.objects.all(),
         required=False,
+        label="Device",
     )
-    virtualmachine = DynamicModelMultipleChoiceField(
+    virtualmachine_id = DynamicModelMultipleChoiceField(
         queryset=VirtualMachine.objects.all(),
         required=False,
         label="Virtual Machine",
     )
-    cluster = DynamicModelMultipleChoiceField(
+    cluster_id = DynamicModelMultipleChoiceField(
         queryset=Cluster.objects.all(),
         required=False,
+        label="Cluster",
     )
-    software_product = DynamicModelMultipleChoiceField(
+    software_product_id = DynamicModelMultipleChoiceField(
         queryset=SoftwareProduct.objects.all(),
         required=False,
         label="Software Product",
     )
-    version = DynamicModelMultipleChoiceField(
+    version_id = DynamicModelMultipleChoiceField(
         queryset=SoftwareProductVersion.objects.all(),
         required=False,
+        label="Version",
     )
 
 

netbox_slm/forms/software_product_version.py

@@ -33,6 +33,7 @@ class SoftwareProductVersionForm(NetBoxModelForm):
         model = SoftwareProductVersion
         fields = (
             "name",
+            "description",
             "software_product",
             "release_date",
             "documentation_url",
@@ -50,22 +51,24 @@ class SoftwareProductVersionFilterForm(NetBoxModelFilterSetForm):
     model = SoftwareProductVersion
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
-        FieldSet("name", "filename", "release_type", "manufacturer", "software_product"),
+        FieldSet("name", "description", "filename", "release_type", "manufacturer_id", "software_product_id"),
     )
     selector_fields = ("q", "filter_id", "name")
 
     tag = TagFilterField(model)
 
     name = CharField(required=False)
+    description = CharField(required=False)
     filename = CharField(required=False)
 
     release_type = MultipleChoiceField(required=False, choices=SoftwareReleaseTypes.choices)
 
-    manufacturer = DynamicModelMultipleChoiceField(
+    manufacturer_id = DynamicModelMultipleChoiceField(
         queryset=Manufacturer.objects.all(),
         required=False,
+        label="Manufacturer",
     )
-    software_product = DynamicModelMultipleChoiceField(
+    software_product_id = DynamicModelMultipleChoiceField(
         queryset=SoftwareProduct.objects.all(),
         required=False,
         label="Software Product",
@@ -77,6 +80,7 @@ class SoftwareProductVersionBulkImportForm(NetBoxModelImportForm):
         model = SoftwareProductVersion
         fields = (
             "name",
+            "description",
             "software_product",
             "release_date",
             "end_of_support",