From 41b2b7dbf638e5efe56919726726141fff9a3f3b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 26 Jul 2016 17:47:40 -0400 Subject: [PATCH] Fixed Tenant import --- netbox/templates/tenancy/tenant_import.html | 11 ++++++++--- netbox/tenancy/forms.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/netbox/templates/tenancy/tenant_import.html b/netbox/templates/tenancy/tenant_import.html index 9d05fa8d7..ef76cacb1 100644 --- a/netbox/templates/tenancy/tenant_import.html +++ b/netbox/templates/tenancy/tenant_import.html @@ -31,22 +31,27 @@ Name Tenant name - Widgets Inc. + WIDG01 Slug URL-friendly name - widgets-inc + widg01 Group Tenant group Customers + + Description + Long-form name or other text (optional) + Widgets Inc. +

Example

-
Widgets Inc.,widgets-inc,Customers
+
WIDG01,widg01,Customers,Widgets Inc.
{% endblock %} diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py index 2661f9101..14ffe7ef4 100644 --- a/netbox/tenancy/forms.py +++ b/netbox/tenancy/forms.py @@ -39,7 +39,7 @@ class TenantFromCSVForm(forms.ModelForm): class Meta: model = Tenant - fields = ['name', 'slug', 'group', 'description', 'comments'] + fields = ['name', 'slug', 'group', 'description'] class TenantImportForm(BulkImportForm, BootstrapMixin):