netbox-contract 2.0.0__tar.gz → 2.0.2__tar.gz

{netbox-contract-2.0.0/src/netbox_contract.egg-info → netbox-contract-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-contract
-Version: 2.0.0
+Version: 2.0.2
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract
@@ -78,3 +78,17 @@ FIELD_CHOICES = {
 (venv) $ cd /opt/netbox/netbox/
 (venv) $ python3 manage.py migrate
 ```
+
+## release notes
+
+### version 2.0.0
+
+Add a new contract asignement model to allow the assignement of contract not only to Circuits. The support for the direct Contract to Circuit relation will be removed in version 2.1.0 . In Order to migrate existing relations contract_migration.py script is provided and can be run from the django shell.
+
+#### version 2.0.1
+
+Add support contract assignement panel to devices.
+
+#### version 2.0.2
+
+Add support for Netbox 3.5 whcih become the minimum version supported to accoodate the removal of NetBoxModelCSVForm class (replaced by NetBoxModelImportForm) .

{netbox-contract-2.0.0 → netbox-contract-2.0.2}/README.md

@@ -63,4 +63,18 @@ FIELD_CHOICES = {
 ```bash
 (venv) $ cd /opt/netbox/netbox/
 (venv) $ python3 manage.py migrate
-```
+```
+
+## release notes
+
+### version 2.0.0
+
+Add a new contract asignement model to allow the assignement of contract not only to Circuits. The support for the direct Contract to Circuit relation will be removed in version 2.1.0 . In Order to migrate existing relations contract_migration.py script is provided and can be run from the django shell.
+
+#### version 2.0.1
+
+Add support contract assignement panel to devices.
+
+#### version 2.0.2
+
+Add support for Netbox 3.5 whcih become the minimum version supported to accoodate the removal of NetBoxModelCSVForm class (replaced by NetBoxModelImportForm) .

{netbox-contract-2.0.0 → netbox-contract-2.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "netbox-contract"
-version = "2.0.0"
+version = "2.0.2"
 authors = [
   { name="Marc Lebreuil", email="marc@famillelebreuil.net" },
 ]

{netbox-contract-2.0.0 → netbox-contract-2.0.2}/src/netbox_contract/__init__.py

@@ -4,11 +4,11 @@ class ContractsConfig(PluginConfig):
     name = 'netbox_contract'
     verbose_name = 'Netbox contract'
     description = 'Contract management plugin for Netbox'
-    version = '2.0.0'
+    version = '2.0.2'
     author = 'Marc Lebreuil'
     author_email = 'marc@famillelebreuil.net'
     base_url = 'contracts'
-    min_version = "3.4.0"
+    min_version = "3.5.0"
     required_settings = []
     default_settings = {
         'top_level_menu': False,

{netbox-contract-2.0.0 → netbox-contract-2.0.2}/src/netbox_contract/forms.py

@@ -1,8 +1,8 @@
 from django import forms
 import django_filters
-from netbox.forms import NetBoxModelForm, NetBoxModelFilterSetForm, NetBoxModelBulkEditForm, NetBoxModelCSVForm
-from utilities.forms.fields import CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, MultipleChoiceField
-from utilities.forms import CSVModelChoiceField, DatePicker,SlugField
+from netbox.forms import NetBoxModelForm, NetBoxModelFilterSetForm, NetBoxModelBulkEditForm, NetBoxModelImportForm
+from utilities.forms.fields import CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, MultipleChoiceField, CSVModelChoiceField, SlugField
+from utilities.forms.widgets import DatePicker
 from extras.filters import TagFilter
 from circuits.models import Circuit
 from .models import Contract, Invoice, ServiceProvider, StatusChoices, ContractAssignement
@@ -72,7 +72,7 @@ class InvoiceFilterSetForm(NetBoxModelFilterSetForm):
         required=False
     )
 
-class ContractCSVForm(NetBoxModelCSVForm):
+class ContractCSVForm(NetBoxModelImportForm):
     circuit = CSVModelChoiceField(
         queryset=Circuit.objects.all(),
         to_field_name='name',
@@ -114,7 +114,7 @@ class ContractBulkEditForm(NetBoxModelBulkEditForm):
     )
     model = Contract
 
-class InvoiceCSVForm(NetBoxModelCSVForm):
+class InvoiceCSVForm(NetBoxModelImportForm):
     contracts = CSVModelChoiceField(
         queryset=Contract.objects.all(),
         to_field_name='name',
@@ -154,7 +154,7 @@ class ServiceProviderFilterSetForm(NetBoxModelFilterSetForm):
     model = ServiceProvider
     tag = TagFilter()
 
-class ServiceProviderCSVForm(NetBoxModelCSVForm):
+class ServiceProviderCSVForm(NetBoxModelImportForm):
     slug = SlugField()
     comments = CommentField()
     class Meta:

{netbox-contract-2.0.0 → netbox-contract-2.0.2}/src/netbox_contract/tables.py

@@ -21,8 +21,38 @@ class ContractAssignementListTable(NetBoxTable):
 
     class Meta(NetBoxTable.Meta):
         model = ContractAssignement
-        fields = ('pk', 'content_type', 'content_object', 'contract', 'actions')
-        default_columns = ('pk', 'content_type', 'content_object', 'contract')
+        fields = ('pk', 'content_type', 'content_object', 'contract','contract__external_partie', 'actions')
+        default_columns = ('pk', 'content_type', 'content_object', 'contract','contract__external_partie')
+
+class ContractAssignementObjectTable(NetBoxTable):
+    contract = tables.Column(
+        linkify=True
+    )
+    actions = columns.ActionsColumn(
+        actions=('edit', 'delete')
+    )
+
+    class Meta(NetBoxTable.Meta):
+        model = ContractAssignement
+        fields = ('pk','contract','contract__external_partie','contract__status', 'actions')
+        default_columns = ('pk', 'contract','contract__external_partie','contract__status')
+
+class ContractAssignementContractTable(NetBoxTable):
+    content_type = columns.ContentTypeColumn(
+        verbose_name='Object Type'
+    )
+    content_object = tables.Column(
+        linkify=True,
+        orderable=False
+    )
+    actions = columns.ActionsColumn(
+        actions=('edit', 'delete')
+    )
+
+    class Meta(NetBoxTable.Meta):
+        model = ContractAssignement
+        fields = ('pk', 'content_type', 'content_object','actions')
+        default_columns = ('pk', 'content_type', 'content_object')
 
 class ContractListTable(NetBoxTable):
 

{netbox-contract-2.0.0 → netbox-contract-2.0.2}/src/netbox_contract/template_content.py

@@ -1,6 +1,7 @@
 from django.contrib.contenttypes.models import ContentType
 from extras.plugins import PluginTemplateExtension
 from circuits.models import Circuit
+from dcim.models import Device
 from .models import ContractAssignement
 from . import tables
 
@@ -23,11 +24,25 @@ class CircuitContractAssignements(PluginTemplateExtension):
         circuit = self.context['object']
         circuit_type = ContentType.objects.get_for_model(Circuit)
         contract_assignements = ContractAssignement.objects.filter(content_type__pk=circuit_type.id, object_id=circuit.id)
-        assignements_table = tables.ContractAssignementListTable(contract_assignements)
+        assignements_table = tables.ContractAssignementObjectTable(contract_assignements)
         assignements_table.configure(self.context['request'])
 
         return self.render('contract_assignements_bottom.html', extra_context={
             'assignements_table': assignements_table,
         })
 
-template_extensions = [ CircuitContracts, CircuitContractAssignements]
+class DeviceContractAssignements(PluginTemplateExtension):
+    model = 'dcim.device'
+
+    def full_width_page(self):
+        device = self.context['object']
+        device_type = ContentType.objects.get_for_model(Device)
+        contract_assignements = ContractAssignement.objects.filter(content_type__pk=device_type.id, object_id=device.id)
+        assignements_table = tables.ContractAssignementObjectTable(contract_assignements)
+        assignements_table.configure(self.context['request'])
+
+        return self.render('contract_assignements_bottom.html', extra_context={
+            'assignements_table': assignements_table,
+        })
+
+template_extensions = [ CircuitContracts, CircuitContractAssignements, DeviceContractAssignements]

{netbox-contract-2.0.0 → netbox-contract-2.0.2}/src/netbox_contract/views.py

@@ -85,7 +85,7 @@ class ContractView(generic.ObjectView):
         invoices_table.configure(request)
         circuit_table = tables.ContractCircuitListTable(instance.circuit.all())
         circuit_table.configure(request)
-        assignements_table = tables.ContractAssignementListTable(instance.assignments.all())
+        assignements_table = tables.ContractAssignementContractTable(instance.assignments.all())
         assignements_table.configure(request)
 
         return {

{netbox-contract-2.0.0 → netbox-contract-2.0.2/src/netbox_contract.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-contract
-Version: 2.0.0
+Version: 2.0.2
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract
@@ -78,3 +78,17 @@ FIELD_CHOICES = {
 (venv) $ cd /opt/netbox/netbox/
 (venv) $ python3 manage.py migrate
 ```
+
+## release notes
+
+### version 2.0.0
+
+Add a new contract asignement model to allow the assignement of contract not only to Circuits. The support for the direct Contract to Circuit relation will be removed in version 2.1.0 . In Order to migrate existing relations contract_migration.py script is provided and can be run from the django shell.
+
+#### version 2.0.1
+
+Add support contract assignement panel to devices.
+
+#### version 2.0.2
+
+Add support for Netbox 3.5 whcih become the minimum version supported to accoodate the removal of NetBoxModelCSVForm class (replaced by NetBoxModelImportForm) .