Merge pull request #113 from mlebreuil/develop

Release 2.0.10

README.md

@@ -132,5 +132,7 @@ Add support for Netbox 3.5 which become the minimum version supported to accomod
 * [88](https://github.com/mlebreuil/netbox-contract/issues/88) Add a placeholder value to the accounting dimensions jsonfield. This placeholder vale con be configured as part of the PLUGINS_CONFIG parameter in the configuration.py file (see above)
 * [89](https://github.com/mlebreuil/netbox-contract/issues/89) add the posibility to link contracts to sites and virtual machines.
 * [99](https://github.com/mlebreuil/netbox-contract/issues/99) list child contracts in on the parent view.
-
+#### version 2.0.10
+* [107](https://github.com/mlebreuil/netbox-contract/issues/107) Add the contacts tab to the service provider detail view.
+* [111](https://github.com/mlebreuil/netbox-contract/issues/111) Correct assignment spelling.
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "netbox-contract"
-version = "2.0.9"
+version = "2.0.10"
 authors = [
   { name="Marc Lebreuil", email="[email protected]" },
 ]

src/netbox_contract/__init__.py

@@ -5,7 +5,7 @@ class ContractsConfig(PluginConfig):
     name = 'netbox_contract'
     verbose_name = 'Netbox contract'
     description = 'Contract management plugin for Netbox'
-    version = '2.0.9'
+    version = '2.0.10'
     author = 'Marc Lebreuil'
     author_email = '[email protected]'
     base_url = 'contracts'

src/netbox_contract/api/serializers.py

@@ -7,7 +7,7 @@
 from tenancy.api.nested_serializers import NestedTenantSerializer
 from utilities.api import get_serializer_for_model
 
-from ..models import Contract, ContractAssignement, Invoice, ServiceProvider
+from ..models import Contract, ContractAssignment, Invoice, ServiceProvider
 
 
 class NestedServiceProviderSerializer(WritableNestedSerializer):
@@ -40,13 +40,13 @@ class Meta:
         fields = ('id', 'url', 'display', 'number')
 
 
-class NestedContractAssignementSerializer(WritableNestedSerializer):
+class NestedContractAssignmentSerializer(WritableNestedSerializer):
     url = serializers.HyperlinkedIdentityField(
-        view_name='plugins-api:netbox_contract-api:ContractAssignement-detail'
+        view_name='plugins-api:netbox_contract-api:ContractAssignment-detail'
     )
 
     class Meta:
-        model = ContractAssignement
+        model = ContractAssignment
         fields = ('id', 'url', 'display', 'contract', 'content_object')
 
 
@@ -137,16 +137,16 @@ class Meta:
         )
 
 
-class ContractAssignementSerializer(NetBoxModelSerializer):
+class ContractAssignmentSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(
-        view_name='plugins-api:netbox_contract-api:contractassignement-detail'
+        view_name='plugins-api:netbox_contract-api:contractassignment-detail'
     )
     content_type = ContentTypeField(queryset=ContentType.objects.all())
     content_object = serializers.SerializerMethodField(read_only=True)
     contract = NestedContractSerializer()
 
     class Meta:
-        model = ContractAssignement
+        model = ContractAssignment
         fields = [
             'id',
             'url',

src/netbox_contract/api/urls.py

@@ -8,6 +8,6 @@
 router.register('contracts', views.ContractViewSet)
 router.register('invoices', views.InvoiceViewSet)
 router.register('serviceproviders', views.ServiceProviderViewSet)
-router.register('contractassignement', views.ContractAssignementViewSet)
+router.register('contractassignment', views.ContractAssignmentViewSet)
 
 urlpatterns = router.urls

src/netbox_contract/api/views.py

@@ -2,7 +2,7 @@
 
 from .. import filtersets, models
 from .serializers import (
-    ContractAssignementSerializer,
+    ContractAssignmentSerializer,
     ContractSerializer,
     InvoiceSerializer,
     ServiceProviderSerializer,
@@ -25,6 +25,6 @@ class ServiceProviderViewSet(NetBoxModelViewSet):
     serializer_class = ServiceProviderSerializer
 
 
-class ContractAssignementViewSet(NetBoxModelViewSet):
-    queryset = models.ContractAssignement.objects.prefetch_related('contract', 'tags')
-    serializer_class = ContractAssignementSerializer
+class ContractAssignmentViewSet(NetBoxModelViewSet):
+    queryset = models.ContractAssignment.objects.prefetch_related('contract', 'tags')
+    serializer_class = ContractAssignmentSerializer

src/netbox_contract/filtersets.py

@@ -1,7 +1,7 @@
 from django.db.models import Q
 from netbox.filtersets import NetBoxModelFilterSet
 
-from .models import Contract, ContractAssignement, Invoice, ServiceProvider
+from .models import Contract, ContractAssignment, Invoice, ServiceProvider
 
 
 class ContractFilterSet(NetBoxModelFilterSet):
@@ -37,9 +37,9 @@ def search(self, queryset, name, value):
         return queryset.filter(name__icontains=value)
 
 
-class ContractAssignementFilterSet(NetBoxModelFilterSet):
+class ContractAssignmentFilterSet(NetBoxModelFilterSet):
     class Meta:
-        model = ContractAssignement
+        model = ContractAssignment
         fields = ('id', 'contract')
 
     def search(self, queryset, name, value):

src/netbox_contract/forms.py

@@ -25,7 +25,7 @@
 from .constants import SERVICE_PROVIDER_MODELS
 from .models import (
     Contract,
-    ContractAssignement,
+    ContractAssignment,
     InternalEntityChoices,
     Invoice,
     ServiceProvider,
@@ -314,27 +314,27 @@ class ServiceProviderBulkEditForm(NetBoxModelBulkEditForm):
     model = ServiceProvider
 
 
-# ContractAssignement
+# ContractAssignment
 
 
-class ContractAssignementForm(NetBoxModelForm):
+class ContractAssignmentForm(NetBoxModelForm):
     contract = DynamicModelChoiceField(queryset=Contract.objects.all())
 
     class Meta:
-        model = ContractAssignement
+        model = ContractAssignment
         fields = ['content_type', 'object_id', 'contract', 'tags']
         widgets = {
             'content_type': forms.HiddenInput(),
             'object_id': forms.HiddenInput(),
         }
 
 
-class ContractAssignementFilterSetForm(NetBoxModelFilterSetForm):
-    model = ContractAssignement
+class ContractAssignmentFilterSetForm(NetBoxModelFilterSetForm):
+    model = ContractAssignment
     contract = DynamicModelChoiceField(queryset=Contract.objects.all())
 
 
-class ContractAssignementImportForm(NetBoxModelImportForm):
+class ContractAssignmentImportForm(NetBoxModelImportForm):
     content_type = CSVContentTypeField(
         queryset=ContentType.objects.all(),
         help_text='Content Type in the form <app>.<model>',
@@ -344,5 +344,5 @@ class ContractAssignementImportForm(NetBoxModelImportForm):
     )
 
     class Meta:
-        model = ContractAssignement
+        model = ContractAssignment
         fields = ['content_type', 'object_id', 'contract', 'tags']

src/netbox_contract/migrations/0023_rename_contractassignement_contractassignment_and_more.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.10 on 2024-03-24 11:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('extras', '0107_cachedvalue_extras_cachedvalue_object'),
+        ('contenttypes', '0002_remove_content_type_name'),
+        (
+            'netbox_contract',
+            '0022_alter_contract_internal_partie_alter_contract_parent',
+        ),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='ContractAssignement',
+            new_name='ContractAssignment',
+        ),
+        migrations.RenameIndex(
+            model_name='contractassignment',
+            new_name='netbox_cont_content_3bf04f_idx',
+            old_name='netbox_cont_content_ff787b_idx',
+        ),
+    ]

src/netbox_contract/models.py

@@ -57,7 +57,7 @@ def get_absolute_url(self):
         return reverse('plugins:netbox_contract:serviceprovider', args=[self.pk])
 
 
-class ContractAssignement(NetBoxModel):
+class ContractAssignment(NetBoxModel):
     content_type = models.ForeignKey(to=ContentType, on_delete=models.CASCADE)
     object_id = models.PositiveBigIntegerField()
     content_object = GenericForeignKey(ct_field='content_type', fk_field='object_id')
@@ -73,7 +73,7 @@ class Meta:
         ]
 
     def get_absolute_url(self):
-        return reverse('plugins:netbox_contract:contractassignement', args=[self.pk])
+        return reverse('plugins:netbox_contract:contractassignment', args=[self.pk])
 
 
 class Contract(NetBoxModel):

src/netbox_contract/navigation.py

@@ -55,9 +55,9 @@
     permissions=['netbox_contract.view_serviceprovider'],
 )
 contract_assignemnt_menu_item = PluginMenuItem(
-    link='plugins:netbox_contract:contractassignement_list',
-    link_text='Contract assignements',
-    permissions=['netbox_contract.view_contractassignement'],
+    link='plugins:netbox_contract:contractassignment_list',
+    link_text='Contract assignments',
+    permissions=['netbox_contract.view_contractassignment'],
 )
 
 items = (

src/netbox_contract/tables.py

@@ -1,18 +1,18 @@
 import django_tables2 as tables
 from netbox.tables import NetBoxTable, columns
 
-from .models import Contract, ContractAssignement, Invoice, ServiceProvider
+from .models import Contract, ContractAssignment, Invoice, ServiceProvider
 
 
-class ContractAssignementListTable(NetBoxTable):
+class ContractAssignmentListTable(NetBoxTable):
     content_type = columns.ContentTypeColumn(verbose_name='Object Type')
     content_object = tables.Column(linkify=True, orderable=False)
     contract = tables.Column(linkify=True)
     actions = columns.ActionsColumn(actions=('edit', 'delete'))
     contract__external_partie_object = tables.Column(linkify=True)
 
     class Meta(NetBoxTable.Meta):
-        model = ContractAssignement
+        model = ContractAssignment
         fields = (
             'pk',
             'content_type',
@@ -32,13 +32,13 @@ class Meta(NetBoxTable.Meta):
         )
 
 
-class ContractAssignementObjectTable(NetBoxTable):
+class ContractAssignmentObjectTable(NetBoxTable):
     contract = tables.Column(linkify=True)
     actions = columns.ActionsColumn(actions=('edit', 'delete'))
     contract__external_partie_object = tables.Column(linkify=True)
 
     class Meta(NetBoxTable.Meta):
-        model = ContractAssignement
+        model = ContractAssignment
         fields = (
             'pk',
             'contract',
@@ -64,14 +64,14 @@ class Meta(NetBoxTable.Meta):
         )
 
 
-class ContractAssignementContractTable(NetBoxTable):
+class ContractAssignmentContractTable(NetBoxTable):
     content_type = columns.ContentTypeColumn(verbose_name='Object Type')
     content_object = tables.Column(linkify=True, verbose_name='Object', orderable=False)
     content_object__status = tables.Column(verbose_name='Status')
     actions = columns.ActionsColumn(actions=('edit', 'delete'))
 
     class Meta(NetBoxTable.Meta):
-        model = ContractAssignement
+        model = ContractAssignment
         fields = (
             'pk',
             'content_type',