{% include 'utilities/obj_table.html' with bulk_delete_url='secrets:secretrole_bulk_delete' %}
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index 0d3d8fdaa..0ca380639 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -93,35 +93,35 @@
diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py
index bf04454ba..eaf95ab2c 100644
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -8,6 +8,18 @@ from utilities.forms import (
from .models import Tenant, TenantGroup
+def bulkedit_tenantgroup_choices():
+ """
+ Include an option to remove the currently assigned TenantGroup from a Tenant.
+ """
+ choices = [
+ (None, '---------'),
+ (0, 'None'),
+ ]
+ choices += [(g.pk, g.name) for g in TenantGroup.objects.all()]
+ return choices
+
+
def bulkedit_tenant_choices():
"""
Include an option to remove the currently assigned Tenant from an object.
@@ -46,7 +58,7 @@ class TenantForm(forms.ModelForm, BootstrapMixin):
class TenantFromCSVForm(forms.ModelForm):
- group = forms.ModelChoiceField(TenantGroup.objects.all(), to_field_name='name',
+ group = forms.ModelChoiceField(TenantGroup.objects.all(), required=False, to_field_name='name',
error_messages={'invalid_choice': 'Group not found.'})
class Meta:
@@ -60,7 +72,7 @@ class TenantImportForm(BulkImportForm, BootstrapMixin):
class TenantBulkEditForm(forms.Form, BootstrapMixin):
pk = forms.ModelMultipleChoiceField(queryset=Tenant.objects.all(), widget=forms.MultipleHiddenInput)
- group = forms.ModelChoiceField(queryset=TenantGroup.objects.all(), required=False)
+ group = forms.TypedChoiceField(choices=bulkedit_tenantgroup_choices, coerce=int, required=False, label='Group')
def tenant_group_choices():
diff --git a/netbox/tenancy/migrations/0002_tenant_group_optional.py b/netbox/tenancy/migrations/0002_tenant_group_optional.py
new file mode 100644
index 000000000..95b1138ac
--- /dev/null
+++ b/netbox/tenancy/migrations/0002_tenant_group_optional.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.8 on 2016-08-02 19:54
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('tenancy', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='tenant',
+ name='group',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='tenants', to='tenancy.TenantGroup'),
+ ),
+ ]
diff --git a/netbox/tenancy/models.py b/netbox/tenancy/models.py
index 72bc92cae..6eb903f8b 100644
--- a/netbox/tenancy/models.py
+++ b/netbox/tenancy/models.py
@@ -28,7 +28,7 @@ class Tenant(CreatedUpdatedModel):
"""
name = models.CharField(max_length=30, unique=True)
slug = models.SlugField(unique=True)
- group = models.ForeignKey('TenantGroup', related_name='tenants', on_delete=models.PROTECT)
+ group = models.ForeignKey('TenantGroup', related_name='tenants', blank=True, null=True, on_delete=models.SET_NULL)
description = models.CharField(max_length=100, blank=True, help_text="Long-form name (optional)")
comments = models.TextField(blank=True)
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index bab624589..ec220b9be 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -2,6 +2,9 @@ from django.contrib.auth.mixins import PermissionRequiredMixin
from django.db.models import Count
from django.shortcuts import get_object_or_404, render
+from circuits.models import Circuit
+from dcim.models import Site, Rack, Device
+from ipam.models import IPAddress, Prefix, VLAN, VRF
from utilities.views import (
BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
)
@@ -50,19 +53,21 @@ class TenantListView(ObjectListView):
def tenant(request, slug):
- tenant = get_object_or_404(Tenant.objects.annotate(
- site_count=Count('sites', distinct=True),
- rack_count=Count('racks', distinct=True),
- device_count=Count('devices', distinct=True),
- vrf_count=Count('vrfs', distinct=True),
- prefix_count=Count('prefixes', distinct=True),
- ipaddress_count=Count('ip_addresses', distinct=True),
- vlan_count=Count('vlans', distinct=True),
- circuit_count=Count('circuits', distinct=True),
- ), slug=slug)
+ tenant = get_object_or_404(Tenant, slug=slug)
+ stats = {
+ 'site_count': Site.objects.filter(tenant=tenant).count(),
+ 'rack_count': Rack.objects.filter(tenant=tenant).count(),
+ 'device_count': Device.objects.filter(tenant=tenant).count(),
+ 'vrf_count': VRF.objects.filter(tenant=tenant).count(),
+ 'prefix_count': Prefix.objects.filter(tenant=tenant).count(),
+ 'ipaddress_count': IPAddress.objects.filter(tenant=tenant).count(),
+ 'vlan_count': VLAN.objects.filter(tenant=tenant).count(),
+ 'circuit_count': Circuit.objects.filter(tenant=tenant).count(),
+ }
return render(request, 'tenancy/tenant.html', {
'tenant': tenant,
+ 'stats': stats,
})
@@ -99,9 +104,10 @@ class TenantBulkEditView(PermissionRequiredMixin, BulkEditView):
def update_objects(self, pk_list, form):
fields_to_update = {}
- for field in ['group']:
- if form.cleaned_data[field]:
- fields_to_update[field] = form.cleaned_data[field]
+ if form.cleaned_data['group'] == 0:
+ fields_to_update['group'] = None
+ elif form.cleaned_data['group']:
+ fields_to_update['group'] = form.cleaned_data['group']
return self.cls.objects.filter(pk__in=pk_list).update(**fields_to_update)
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 3b4e93f10..836fe633f 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -1,3 +1,4 @@
+import csv
import re
from django import forms
@@ -118,7 +119,8 @@ class Livesearch(forms.TextInput):
class CSVDataField(forms.CharField):
"""
- A field for comma-separated values (CSV)
+ A field for comma-separated values (CSV). Values containing commas should be encased within double quotes. Example:
+ '"New York, NY",new-york-ny,Other stuff' => ['New York, NY', 'new-york-ny', 'Other stuff']
"""
csv_form = None
@@ -136,16 +138,16 @@ class CSVDataField(forms.CharField):
def to_python(self, value):
# Return a list of dictionaries, each representing an individual record
records = []
- for i, row in enumerate(value.split('\n'), start=1):
- if row.strip():
- values = row.strip().split(',')
- if len(values) < len(self.columns):
+ reader = csv.reader(value.splitlines())
+ for i, row in enumerate(reader, start=1):
+ if row:
+ if len(row) < len(self.columns):
raise forms.ValidationError("Line {}: Field(s) missing (found {}; expected {})"
- .format(i, len(values), len(self.columns)))
- elif len(values) > len(self.columns):
+ .format(i, len(row), len(self.columns)))
+ elif len(row) > len(self.columns):
raise forms.ValidationError("Line {}: Too many fields (found {}; expected {})"
- .format(i, len(values), len(self.columns)))
- record = dict(zip(self.columns, values))
+ .format(i, len(row), len(self.columns)))
+ record = dict(zip(self.columns, row))
records.append(record)
return records