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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-contract
-Version: 2.0.2
+Version: 2.0.3
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract
@@ -91,4 +91,9 @@ 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) .
+Add support for Netbox 3.5 which become the minimum version supported to accomodate the removal of NetBoxModelCSVForm class (replaced by NetBoxModelImportForm) .
+
+#### version 2.0.3
+
+* [#60](https://github.com/mlebreuil/netbox-contract/issues/60) Update contract quick search to also filter on fields "External reference" and "Comments".
+* [#49](https://github.com/mlebreuil/netbox-contract/issues/49) Manage permissions.

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

@@ -77,4 +77,9 @@ 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) .
+Add support for Netbox 3.5 which become the minimum version supported to accomodate the removal of NetBoxModelCSVForm class (replaced by NetBoxModelImportForm) .
+
+#### version 2.0.3
+
+* [#60](https://github.com/mlebreuil/netbox-contract/issues/60) Update contract quick search to also filter on fields "External reference" and "Comments".
+* [#49](https://github.com/mlebreuil/netbox-contract/issues/49) Manage permissions.

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

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

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

@@ -4,7 +4,7 @@ class ContractsConfig(PluginConfig):
     name = 'netbox_contract'
     verbose_name = 'Netbox contract'
     description = 'Contract management plugin for Netbox'
-    version = '2.0.2'
+    version = '2.0.3'
     author = 'Marc Lebreuil'
     author_email = 'marc@famillelebreuil.net'
     base_url = 'contracts'

{netbox-contract-2.0.2 → netbox-contract-2.0.3}/src/netbox_contract/filtersets.py

@@ -10,9 +10,10 @@ class ContractFilterSet(NetBoxModelFilterSet):
         fields = ('id', 'external_partie', 'internal_partie', 'status','circuit')
 
     def search(self, queryset, name, value):
-        return queryset.filter( Q(name__icontains=value) 
-                               | Q(circuit__cid__icontains=value) 
-                               | Q(external_partie__name__icontains=value))
+        return queryset.filter( Q(name__icontains=value)
+                               | Q(external_partie__name__icontains=value)
+                               | Q(external_reference__icontains=value)
+                               | Q(comments__icontains=value))
 
 class InvoiceFilterSet(NetBoxModelFilterSet):
 

{netbox-contract-2.0.2 → netbox-contract-2.0.3}/src/netbox_contract/navigation.py

@@ -9,7 +9,8 @@ contract_buttons = [
         link='plugins:netbox_contract:contract_add',
         title='Add',
         icon_class='mdi mdi-plus-thick',
-        color=ButtonColorChoices.GREEN
+        color=ButtonColorChoices.GREEN,
+        permissions=['netbox_contract.add_contract']
     )
 ]
 
@@ -18,7 +19,8 @@ invoice_buttons = [
         link='plugins:netbox_contract:invoice_add',
         title='Add',
         icon_class='mdi mdi-plus-thick',
-        color=ButtonColorChoices.GREEN
+        color=ButtonColorChoices.GREEN,
+        permissions=['netbox_contract.add_invoice']
     )
 ]
 
@@ -27,26 +29,30 @@ serviceprovider_buttons = [
         link='plugins:netbox_contract:serviceprovider_add',
         title='Add',
         icon_class='mdi mdi-plus-thick',
-        color=ButtonColorChoices.GREEN
+        color=ButtonColorChoices.GREEN,
+        permissions=['netbox_contract.add_serviceprovider']
     )
 ]
- 
+
 contract_menu_item = PluginMenuItem(
         link='plugins:netbox_contract:contract_list',
         link_text='Contracts',
-        buttons=contract_buttons
+        buttons=contract_buttons,
+        permissions=['netbox_contract.view_contract']
     )
 
 invoices_menu_item = PluginMenuItem(
         link='plugins:netbox_contract:invoice_list',
         link_text='Invoices',
-        buttons=invoice_buttons
+        buttons=invoice_buttons,
+        permissions=['netbox_contract.view_invoice']
     )
 
 service_provider_menu_item = PluginMenuItem(
         link='plugins:netbox_contract:serviceprovider_list',
         link_text='Service Providers',
-        buttons=serviceprovider_buttons
+        buttons=serviceprovider_buttons,
+        permissions=['netbox_contract.view_serviceprovider']
     )
 
 items = (contract_menu_item,invoices_menu_item,service_provider_menu_item)

{netbox-contract-2.0.2 → netbox-contract-2.0.3}/src/netbox_contract/templates/contract_assignements_bottom.html

@@ -1,4 +1,5 @@
 {% load render_table from django_tables2 %}
+{% if perms.netbox_contract.view_contract %}
 <div class="row">
     <div class="col col-md-12">
       <div class="card">
@@ -8,12 +9,15 @@
           {% render_table assignements_table %}
         </div>
         {% endif %}
+        {% if perms.netbox_contract.add_contractassignement %}
         <div class="card-footer text-end noprint">
           <a href="{% url 'plugins:netbox_contract:contractassignement_add' %}?content_type={{ object|content_type_id }}&object_id={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
               <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
               Add assignement
           </a>
-      </div>
+        </div>
+        {% endif %}
       </div>
     </div>
-</div>
+</div>
+{% endif %}

{netbox-contract-2.0.2 → netbox-contract-2.0.3}/src/netbox_contract/templates/contract_list_bottom.html

@@ -1,4 +1,5 @@
 {% load render_table from django_tables2 %}
+{% if perms.netbox_contract.view_contract %}
 <div class="row">
     <div class="col col-md-12">
       <div class="card">
@@ -8,4 +9,5 @@
         </div>
       </div>
     </div>
-</div>
+</div>
+{% endif %}

{netbox-contract-2.0.2 → netbox-contract-2.0.3}/src/netbox_contract/templates/netbox_contract/contract.html

@@ -111,6 +111,7 @@
       </div>
     </div>
   </div>
+  {% if perms.netbox_contract.view_invoice %}
   <div class="row">
     <div class="col col-md-12">
       <div class="card">
@@ -118,13 +119,16 @@
         <div class="card-body table-responsive">
           {% render_table invoices_table %}
         </div>
+        {% if perms.netbox_contract.add_invoice %}
         <div class="card-footer text-end noprint">
           <a href="{% url 'plugins:netbox_contract:invoice_add' %}?contracts={{ object.pk }}" class="btn btn-primary btn-sm">
               <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
               Add an invoice
           </a>
-      </div>
+        </div>
+        {% endif %}
       </div>
     </div>
   </div>
+  {% endif %}
 {% endblock content %}

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-contract
-Version: 2.0.2
+Version: 2.0.3
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract
@@ -91,4 +91,9 @@ 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) .
+Add support for Netbox 3.5 which become the minimum version supported to accomodate the removal of NetBoxModelCSVForm class (replaced by NetBoxModelImportForm) .
+
+#### version 2.0.3
+
+* [#60](https://github.com/mlebreuil/netbox-contract/issues/60) Update contract quick search to also filter on fields "External reference" and "Comments".
+* [#49](https://github.com/mlebreuil/netbox-contract/issues/49) Manage permissions.