From b7b04045de2f17bd2078677e7e491df43a82b9a3 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 25 Sep 2019 12:07:41 -0400 Subject: [PATCH] Closes #3515: Enable export templates for inventory items --- CHANGELOG.md | 1 + netbox/extras/constants.py | 1 + netbox/extras/models.py | 11 ++++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3303a71d4..a51653e4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ v2.6.5 (FUTURE) * [#3297](https://github.com/netbox-community/netbox/issues/3297) - Include reserved units when calculating rack utilization * [#3347](https://github.com/netbox-community/netbox/issues/3347) - Extend upgrade script to automatically remove stale content types * [#3352](https://github.com/netbox-community/netbox/issues/3352) - Enable filtering changelog API by `changed_object_id` +* [#3515](https://github.com/netbox-community/netbox/issues/3515) - Enable export templates for inventory items * [#3524](https://github.com/netbox-community/netbox/issues/3524) - Enable bulk editing of power outlet/power port associations * [#3529](https://github.com/netbox-community/netbox/issues/3529) - Enable filtering circuits list by region diff --git a/netbox/extras/constants.py b/netbox/extras/constants.py index d136d3271..2545b34d5 100644 --- a/netbox/extras/constants.py +++ b/netbox/extras/constants.py @@ -107,6 +107,7 @@ EXPORTTEMPLATE_MODELS = [ 'dcim.device', 'dcim.devicetype', 'dcim.interface', + 'dcim.inventoryitem', 'dcim.manufacturer', 'dcim.powerpanel', 'dcim.powerport', diff --git a/netbox/extras/models.py b/netbox/extras/models.py index d764e3d31..04caf3376 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -435,14 +435,19 @@ class ExportTemplate(models.Model): choices=TEMPLATE_LANGUAGE_CHOICES, default=TEMPLATE_LANGUAGE_JINJA2 ) - template_code = models.TextField() + template_code = models.TextField( + help_text='The list of objects being exported is passed as a context variable named queryset.' + ) mime_type = models.CharField( max_length=50, - blank=True + blank=True, + verbose_name='MIME type', + help_text='Defaults to text/plain' ) file_extension = models.CharField( max_length=15, - blank=True + blank=True, + help_text='Extension to append to the rendered filename' ) class Meta: