mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Closes: #4967 - Adds Tenancy to Aggregate model

Browse Source
This commit is contained in:
Daniel Sheppard
2020-10-15 20:40:19 -05:00
parent c9c8d337a0
commit 32274dec86
8 changed files with 98 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/ipam/forms.py
View File

@ -225,7 +225,7 @@ class RIRFilterForm(BootstrapMixin, forms.Form):
# Aggregates
#
class AggregateForm(BootstrapMixin, CustomFieldModelForm):
class AggregateForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
rir = DynamicModelChoiceField(
queryset=RIR.objects.all()
)
@ -237,7 +237,7 @@ class AggregateForm(BootstrapMixin, CustomFieldModelForm):
class Meta:
model = Aggregate
fields = [
'prefix', 'rir', 'date_added', 'description', 'tags',
'prefix', 'rir', 'date_added', 'description', 'tenant_group', 'tenant', 'tags',
]
help_texts = {
'prefix': "IPv4 or IPv6 network",
@ -254,6 +254,12 @@ class AggregateCSVForm(CustomFieldModelCSVForm):
to_field_name='name',
help_text='Assigned RIR'
)
tenant = CSVModelChoiceField(
queryset=Tenant.objects.all(),
required=False,
to_field_name='name',
help_text='Assigned tenant'
)
class Meta:
model = Aggregate
@ -270,6 +276,10 @@ class AggregateBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd
required=False,
label='RIR'
)
tenant = DynamicModelChoiceField(
queryset=Tenant.objects.all(),
required=False
)
date_added = forms.DateField(
required=False
)
@ -287,7 +297,7 @@ class AggregateBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd
}
class AggregateFilterForm(BootstrapMixin, CustomFieldFilterForm):
class AggregateFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
model = Aggregate
q = forms.CharField(
required=False,