| Face |
- Rack face; front or rear (optional) |
+ Rack face; front or rear (required if position is set) |
Rear |
diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py
index 40b5b5b1d..8bbd05372 100644
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -1,8 +1,9 @@
from django import forms
-from django.db.models import Count
from extras.forms import CustomFieldForm, CustomFieldBulkEditForm, CustomFieldFilterForm
-from utilities.forms import BootstrapMixin, BulkImportForm, CommentField, CSVDataField, SlugField
+from utilities.forms import (
+ BootstrapMixin, BulkImportForm, CommentField, CSVDataField, FilterChoiceField, SlugField, get_filter_choices,
+)
from .models import Tenant, TenantGroup
@@ -74,12 +75,6 @@ class TenantBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
group = forms.TypedChoiceField(choices=bulkedit_tenantgroup_choices, coerce=int, required=False, label='Group')
-def tenant_group_choices():
- group_choices = TenantGroup.objects.annotate(tenant_count=Count('tenants'))
- return [(g.slug, u'{} ({})'.format(g.name, g.tenant_count)) for g in group_choices]
-
-
class TenantFilterForm(BootstrapMixin, CustomFieldFilterForm):
model = Tenant
- group = forms.MultipleChoiceField(required=False, choices=tenant_group_choices,
- widget=forms.SelectMultiple(attrs={'size': 8}))
+ group = FilterChoiceField(choices=get_filter_choices(TenantGroup, id_field='slug', count_field='tenants'))
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 4cbc1028b..30989ddcf 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -3,6 +3,7 @@ import re
from django import forms
from django.core.urlresolvers import reverse_lazy
+from django.db.models import Count
from django.utils.encoding import force_text
from django.utils.html import format_html
from django.utils.safestring import mark_safe
@@ -34,6 +35,27 @@ def add_blank_choice(choices):
return ((None, '---------'),) + choices
+def get_filter_choices(model, id_field='pk', select_related=[], count_field=None):
+ """
+ Return a list of choices suitable for a ChoiceField.
+
+ :param model: The base model to use for the queryset
+ :param id_field: Field to use as the object identifier
+ :param select_related: Any related tables to include
+ :param count: The field to use for a child COUNT() (optional)
+ :return:
+ """
+ queryset = model.objects.all()
+ if select_related:
+ queryset = queryset.select_related(*select_related)
+ if count_field:
+ queryset = queryset.annotate(child_count=Count(count_field))
+ return [(getattr(obj, id_field), u'{} ({})'.format(obj, obj.child_count)) for obj in queryset]
+ else:
+ return [(getattr(obj, id_field), u'{}'.format(obj)) for obj in queryset]
+
+
+
#
# Widgets
#
@@ -222,6 +244,16 @@ class SlugField(forms.SlugField):
self.widget.attrs['slug-source'] = slug_source
+class FilterChoiceField(forms.MultipleChoiceField):
+
+ def __init__(self, *args, **kwargs):
+ if 'required' not in kwargs:
+ kwargs['required'] = False
+ if 'widget' not in kwargs:
+ kwargs['widget'] = forms.SelectMultiple(attrs={'size': 6})
+ super(FilterChoiceField, self).__init__(*args, **kwargs)
+
+
#
# Forms
#
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index f36beb69d..a719d3fbf 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -1,7 +1,6 @@
from django_tables2 import RequestConfig
from django.contrib import messages
-from django.contrib.admin.views.decorators import staff_member_required
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import reverse
@@ -381,10 +380,6 @@ class BulkDeleteView(View):
template_name = 'utilities/confirm_bulk_delete.html'
default_redirect_url = None
- @method_decorator(staff_member_required)
- def dispatch(self, *args, **kwargs):
- return super(BulkDeleteView, self).dispatch(*args, **kwargs)
-
def post(self, request, *args, **kwargs):
# Attempt to derive parent object if a parent class has been given
diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh
old mode 100644
new mode 100755