- Showing {{ table.page.start_index }}-{{ table.page.end_index }} of {{ total }}
- {% if total == 1 %}
- {{ table.data.verbose_name }}
- {% else %}
- {{ table.data.verbose_name_plural }}
- {% endif %}
+ {% with table.page.paginator.count as total %}
+ Showing {{ table.page.start_index }}-{{ table.page.end_index }} of {{ total }}
+ {% if total == 1 %}
+ {{ table.data.verbose_name }}
+ {% else %}
+ {{ table.data.verbose_name_plural }}
+ {% endif %}
+ {% endwith %}
diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py
index 485f2f34b..e9a39d237 100644
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -2,8 +2,10 @@ 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, FilterChoiceField, SlugField
-
+from utilities.forms import (
+ APISelect, BootstrapMixin, BulkImportForm, ChainedFieldsMixin, ChainedModelChoiceField, CommentField, CSVDataField,
+ FilterChoiceField, SlugField,
+)
from .models import Tenant, TenantGroup
@@ -61,3 +63,36 @@ class TenantFilterForm(BootstrapMixin, CustomFieldFilterForm):
to_field_name='slug',
null_option=(0, 'None')
)
+
+
+#
+# Tenancy form extension
+#
+
+class TenancyForm(ChainedFieldsMixin, forms.Form):
+ tenant_group = forms.ModelChoiceField(
+ queryset=TenantGroup.objects.all(),
+ required=False,
+ widget=forms.Select(
+ attrs={'filter-for': 'tenant', 'nullable': 'true'}
+ )
+ )
+ tenant = ChainedModelChoiceField(
+ queryset=Tenant.objects.all(),
+ chains={'group': 'tenant_group'},
+ required=False,
+ widget=APISelect(
+ api_url='/api/tenancy/tenants/?group_id={{tenant_group}}'
+ )
+ )
+
+ def __init__(self, *args, **kwargs):
+
+ # Initialize helper selector
+ instance = kwargs.get('instance')
+ if instance and instance.tenant is not None:
+ initial = kwargs.get('initial', {})
+ initial['tenant_group'] = instance.tenant.group
+ kwargs['initial'] = initial
+
+ super(TenancyForm, self).__init__(*args, **kwargs)
diff --git a/netbox/tenancy/tables.py b/netbox/tenancy/tables.py
index bacb4c12f..56cf1c02a 100644
--- a/netbox/tenancy/tables.py
+++ b/netbox/tenancy/tables.py
@@ -44,6 +44,7 @@ class TenantTable(BaseTable):
class TenantSearchTable(SearchTable):
+ name = tables.LinkColumn()
class Meta(SearchTable.Meta):
model = Tenant
diff --git a/netbox/users/views.py b/netbox/users/views.py
index 03e913742..d88217f40 100644
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -216,10 +216,13 @@ class TokenEditView(LoginRequiredMixin, View):
token.user = request.user
token.save()
- msg = "Token updated" if pk else "New token created"
+ msg = "Modified token {}".format(token) if pk else "Created token {}".format(token)
messages.success(request, msg)
- return redirect('user:token_list')
+ if '_addanother' in request.POST:
+ return redirect(request.path)
+ else:
+ return redirect('user:token_list')
class TokenDeleteView(LoginRequiredMixin, View):
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index d14c56e7b..8afe8b58e 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -331,6 +331,25 @@ class FlexibleModelChoiceField(forms.ModelChoiceField):
return value
+class ChainedModelChoiceField(forms.ModelChoiceField):
+ """
+ A ModelChoiceField which is initialized based on the values of other fields within a form. `chains` is a dictionary
+ mapping of model fields to peer fields within the form. For example:
+
+ country1 = forms.ModelChoiceField(queryset=Country.objects.all())
+ city1 = ChainedModelChoiceField(queryset=City.objects.all(), chains={'country': 'country1'}
+
+ The queryset of the `city1` field will be modified as
+
+ .filter(country=)
+
+ where is the value of the `country1` field. (Note: The form must inherit from ChainedFieldsMixin.)
+ """
+ def __init__(self, chains=None, *args, **kwargs):
+ self.chains = chains
+ super(ChainedModelChoiceField, self).__init__(*args, **kwargs)
+
+
class SlugField(forms.SlugField):
def __init__(self, slug_source='name', *args, **kwargs):
@@ -411,6 +430,32 @@ class BootstrapMixin(forms.BaseForm):
field.widget.attrs['placeholder'] = field.label
+class ChainedFieldsMixin(forms.BaseForm):
+ """
+ Iterate through all ChainedModelChoiceFields in the form and modify their querysets based on chained fields.
+ """
+ def __init__(self, *args, **kwargs):
+ super(ChainedFieldsMixin, self).__init__(*args, **kwargs)
+
+ for field_name, field in self.fields.items():
+
+ if isinstance(field, ChainedModelChoiceField):
+
+ filters_dict = {}
+ for db_field, parent_field in field.chains.items():
+ if self.is_bound:
+ filters_dict[db_field] = self.data.get(parent_field) or None
+ elif self.initial.get(parent_field):
+ filters_dict[db_field] = self.initial[parent_field]
+ else:
+ filters_dict[db_field] = None
+
+ if filters_dict:
+ field.queryset = field.queryset.filter(**filters_dict)
+ else:
+ field.queryset = field.queryset.none()
+
+
class ReturnURLForm(forms.Form):
"""
Provides a hidden return URL field to control where the user is directed after the form is submitted.
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index 8aaded410..98400bccd 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -24,3 +24,15 @@ def csv_format(data):
csv.append(u'{}'.format(value))
return u','.join(csv)
+
+
+def foreground_color(bg_color):
+ """
+ Return the ideal foreground color (black or white) for a given background color in hexadecimal RGB format.
+ """
+ bg_color = bg_color.strip('#')
+ r, g, b = [int(bg_color[c:c + 2], 16) for c in (0, 2, 4)]
+ if r * 0.299 + g * 0.587 + b * 0.114 > 186:
+ return '000000'
+ else:
+ return 'ffffff'
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index a91055964..861977c31 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -290,66 +290,78 @@ class BulkAddView(View):
"""
Create new objects in bulk.
- form: Form class
+ pattern_form: Form class which provides the `pattern` field
model_form: The ModelForm used to create individual objects
template_name: The name of the template
default_return_url: Name of the URL to which the user is redirected after creating the objects
"""
- form = None
+ pattern_form = None
model_form = None
+ pattern_target = ''
template_name = None
default_return_url = 'home'
def get(self, request):
- form = self.form()
+ pattern_form = self.pattern_form()
+ model_form = self.model_form()
return render(request, self.template_name, {
'obj_type': self.model_form._meta.model._meta.verbose_name,
- 'form': form,
+ 'pattern_form': pattern_form,
+ 'model_form': model_form,
'return_url': reverse(self.default_return_url),
})
def post(self, request):
model = self.model_form._meta.model
- form = self.form(request.POST)
- if form.is_valid():
+ pattern_form = self.pattern_form(request.POST)
+ model_form = self.model_form(request.POST)
- # Read the pattern field and target from the form's pattern_map
- pattern_field, pattern_target = form.pattern_map
- pattern = form.cleaned_data[pattern_field]
- model_form_data = form.cleaned_data
+ if pattern_form.is_valid():
+ pattern = pattern_form.cleaned_data['pattern']
new_objs = []
+
try:
with transaction.atomic():
- # Validate and save each object individually
+
+ # Create objects from the expanded. Abort the transaction on the first validation error.
for value in pattern:
- model_form_data[pattern_target] = value
- model_form = self.model_form(model_form_data)
+
+ # Reinstantiate the model form each time to avoid overwriting the same instance. Use a mutable
+ # copy of the POST QueryDict so that we can update the target field value.
+ model_form = self.model_form(request.POST.copy())
+ model_form.data[self.pattern_target] = value
+
+ # Validate each new object independently.
if model_form.is_valid():
obj = model_form.save()
new_objs.append(obj)
else:
- for error in model_form.errors.as_data().values():
- form.add_error(None, error)
- # Abort the creation of all objects if errors exist
- if form.errors:
- raise ValidationError("Validation of one or more model forms failed.")
- except ValidationError:
+ # Copy any errors on the pattern target field to the pattern form.
+ errors = model_form.errors.as_data()
+ if errors.get(self.pattern_target):
+ pattern_form.add_error('pattern', errors[self.pattern_target])
+ # Raise an IntegrityError to break the for loop and abort the transaction.
+ raise IntegrityError()
+
+ # If we make it to this point, validation has succeeded on all new objects.
+ msg = u"Added {} {}".format(len(new_objs), model._meta.verbose_name_plural)
+ messages.success(request, msg)
+ UserAction.objects.log_bulk_create(request.user, ContentType.objects.get_for_model(model), msg)
+
+ if '_addanother' in request.POST:
+ return redirect(request.path)
+ return redirect(self.default_return_url)
+
+ except IntegrityError:
pass
- if not form.errors:
- msg = u"Added {} {}".format(len(new_objs), model._meta.verbose_name_plural)
- messages.success(request, msg)
- UserAction.objects.log_bulk_create(request.user, ContentType.objects.get_for_model(model), msg)
- if '_addanother' in request.POST:
- return redirect(request.path)
- return redirect(self.default_return_url)
-
return render(request, self.template_name, {
- 'form': form,
+ 'pattern_form': pattern_form,
+ 'model_form': model_form,
'obj_type': model._meta.verbose_name,
'return_url': reverse(self.default_return_url),
})