From 187a6dee1735a4e706a0ebe64d96dfba64a14f6e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 27 Sep 2016 16:31:18 -0400 Subject: [PATCH] Closes #579: Add a description field to ExportTemplate --- netbox/extras/admin.py | 2 +- .../0003_exporttemplate_add_description.py | 25 +++++++++++++++++++ netbox/extras/models.py | 3 ++- netbox/templates/inc/export_button.html | 2 +- 4 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 netbox/extras/migrations/0003_exporttemplate_add_description.py diff --git a/netbox/extras/admin.py b/netbox/extras/admin.py index b0d33c189..b7ed94c21 100644 --- a/netbox/extras/admin.py +++ b/netbox/extras/admin.py @@ -40,7 +40,7 @@ class GraphAdmin(admin.ModelAdmin): @admin.register(ExportTemplate) class ExportTemplateAdmin(admin.ModelAdmin): - list_display = ['name', 'content_type', 'mime_type', 'file_extension'] + list_display = ['name', 'content_type', 'description', 'mime_type', 'file_extension'] @admin.register(TopologyMap) diff --git a/netbox/extras/migrations/0003_exporttemplate_add_description.py b/netbox/extras/migrations/0003_exporttemplate_add_description.py new file mode 100644 index 000000000..6355955b5 --- /dev/null +++ b/netbox/extras/migrations/0003_exporttemplate_add_description.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-09-27 20:20 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0002_custom_fields'), + ] + + operations = [ + migrations.AddField( + model_name='exporttemplate', + name='description', + field=models.CharField(blank=True, max_length=200), + ), + migrations.AlterField( + model_name='exporttemplate', + name='name', + field=models.CharField(max_length=100), + ), + ] diff --git a/netbox/extras/models.py b/netbox/extras/models.py index a93b1ab90..40ce4a1f5 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -233,7 +233,8 @@ class Graph(models.Model): class ExportTemplate(models.Model): content_type = models.ForeignKey(ContentType, limit_choices_to={'model__in': EXPORTTEMPLATE_MODELS}) - name = models.CharField(max_length=200) + name = models.CharField(max_length=100) + description = models.CharField(max_length=200, blank=True) template_code = models.TextField() mime_type = models.CharField(max_length=15, blank=True) file_extension = models.CharField(max_length=15, blank=True) diff --git a/netbox/templates/inc/export_button.html b/netbox/templates/inc/export_button.html index 7b049b2c3..8851fe1f7 100644 --- a/netbox/templates/inc/export_button.html +++ b/netbox/templates/inc/export_button.html @@ -8,7 +8,7 @@
  • CSV (default)
  • {% for et in export_templates %} -
  • {{ et.name }}
  • +
  • {{ et.name }}
  • {% endfor %}