NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-19 05:21:55 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Closes #1821: Added 'description' field to Site model

Browse Source
This commit is contained in:
Jeremy Stretch 2018-01-25 13:29:09 -05:00
parent ed10a99771
commit 7378d82bc4
8 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netbox/dcim/api/serializers.py
View File

@ -64,9 +64,9 @@ class SiteSerializer(CustomFieldModelSerializer):
class Meta: class Meta:
model = Site model = Site
fields = [ fields = [
'id', 'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'physical_address', 'id', 'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'description',
'shipping_address', 'contact_name', 'contact_phone', 'contact_email', 'comments', 'custom_fields', 'physical_address', 'shipping_address', 'contact_name', 'contact_phone', 'contact_email', 'comments',
'created', 'last_updated', 'count_prefixes', 'count_vlans', 'count_racks', 'count_devices', 'custom_fields', 'created', 'last_updated', 'count_prefixes', 'count_vlans', 'count_racks', 'count_devices',
'count_circuits', 'count_circuits',
] ]
@ -85,9 +85,9 @@ class WritableSiteSerializer(CustomFieldModelSerializer):
class Meta: class Meta:
model = Site model = Site
fields = [ fields = [
'id', 'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'physical_address', 'id', 'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'description',
'shipping_address', 'contact_name', 'contact_phone', 'contact_email', 'comments', 'custom_fields', 'physical_address', 'shipping_address', 'contact_name', 'contact_phone', 'contact_email', 'comments',
'created', 'last_updated', 'custom_fields', 'created', 'last_updated',
] ]

1
netbox/dcim/filters.py
View File

@ -75,6 +75,7 @@ class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet):
qs_filter = ( qs_filter = (
Q(name__icontains=value) | Q(name__icontains=value) |
Q(facility__icontains=value) | Q(facility__icontains=value) |
Q(description__icontains=value) |
Q(physical_address__icontains=value) | Q(physical_address__icontains=value) |
Q(shipping_address__icontains=value) | Q(shipping_address__icontains=value) |
Q(contact_name__icontains=value) | Q(contact_name__icontains=value) |

12
netbox/dcim/forms.py
View File

@ -104,8 +104,9 @@ class SiteForm(BootstrapMixin, TenancyForm, CustomFieldForm):
class Meta: class Meta:
model = Site model = Site
fields = [ fields = [
'name', 'slug', 'status', 'region', 'tenant_group', 'tenant', 'facility', 'asn', 'physical_address', 'name', 'slug', 'status', 'region', 'tenant_group', 'tenant', 'facility', 'asn', 'description',
'shipping_address', 'contact_name', 'contact_phone', 'contact_email', 'time_zone', 'comments', 'physical_address', 'shipping_address', 'contact_name', 'contact_phone', 'contact_email', 'time_zone',
'comments',
] ]
widgets = { widgets = {
'physical_address': SmallTextarea(attrs={'rows': 3}), 'physical_address': SmallTextarea(attrs={'rows': 3}),
@ -148,8 +149,8 @@ class SiteCSVForm(forms.ModelForm):
class Meta: class Meta:
model = Site model = Site
fields = [ fields = [
'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'physical_address', 'shipping_address', 'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'description', 'physical_address',
'contact_name', 'contact_phone', 'contact_email', 'time_zone', 'comments', 'shipping_address', 'contact_name', 'contact_phone', 'contact_email', 'time_zone', 'comments',
] ]
help_texts = { help_texts = {
'name': 'Site name', 'name': 'Site name',
@ -164,10 +165,11 @@ class SiteBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
region = TreeNodeChoiceField(queryset=Region.objects.all(), required=False) region = TreeNodeChoiceField(queryset=Region.objects.all(), required=False)
tenant = forms.ModelChoiceField(queryset=Tenant.objects.all(), required=False) tenant = forms.ModelChoiceField(queryset=Tenant.objects.all(), required=False)
asn = forms.IntegerField(min_value=1, max_value=4294967295, required=False, label='ASN') asn = forms.IntegerField(min_value=1, max_value=4294967295, required=False, label='ASN')
description = forms.CharField(max_length=100, required=False)
time_zone = TimeZoneFormField(required=False) time_zone = TimeZoneFormField(required=False)
class Meta: class Meta:
nullable_fields = ['region', 'tenant', 'asn', 'time_zone'] nullable_fields = ['region', 'tenant', 'asn', 'description', 'time_zone']
def site_status_choices(): def site_status_choices():

7
netbox/dcim/migrations/0054_site_status_timezone.py → netbox/dcim/migrations/0054_site_status_timezone_description.py
View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.11.6 on 2018-01-25 17:57 # Generated by Django 1.11.6 on 2018-01-25 18:21
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations, models
@ -13,6 +13,11 @@ class Migration(migrations.Migration):
] ]
operations = [ operations = [
migrations.AddField(
model_name='site',
name='description',
field=models.CharField(blank=True, max_length=100),
),
migrations.AddField( migrations.AddField(
model_name='site', model_name='site',
name='status', name='status',

6
netbox/dcim/models.py
View File

@ -89,6 +89,7 @@ class Site(CreatedUpdatedModel, CustomFieldModel):
facility = models.CharField(max_length=50, blank=True) facility = models.CharField(max_length=50, blank=True)
asn = ASNField(blank=True, null=True, verbose_name='ASN') asn = ASNField(blank=True, null=True, verbose_name='ASN')
time_zone = TimeZoneField(blank=True) time_zone = TimeZoneField(blank=True)
description = models.CharField(max_length=100, blank=True)
physical_address = models.CharField(max_length=200, blank=True) physical_address = models.CharField(max_length=200, blank=True)
shipping_address = models.CharField(max_length=200, blank=True) shipping_address = models.CharField(max_length=200, blank=True)
contact_name = models.CharField(max_length=50, blank=True) contact_name = models.CharField(max_length=50, blank=True)
@ -101,8 +102,8 @@ class Site(CreatedUpdatedModel, CustomFieldModel):
objects = SiteManager() objects = SiteManager()
csv_headers = [ csv_headers = [
'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'contact_name', 'contact_phone', 'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'description', 'contact_name',
'contact_email', 'contact_phone', 'contact_email',
] ]
class Meta: class Meta:
@ -124,6 +125,7 @@ class Site(CreatedUpdatedModel, CustomFieldModel):
self.facility, self.facility,
self.asn, self.asn,
self.time_zone, self.time_zone,
self.description,
self.contact_name, self.contact_name,
self.contact_phone, self.contact_phone,
self.contact_email, self.contact_email,

17
netbox/dcim/tables.py
View File

@ -151,22 +151,7 @@ class SiteTable(BaseTable):
class Meta(BaseTable.Meta): class Meta(BaseTable.Meta):
model = Site model = Site
fields = ('pk', 'name', 'status', 'facility', 'region', 'tenant', 'asn') fields = ('pk', 'name', 'status', 'facility', 'region', 'tenant', 'asn', 'description')
class SiteDetailTable(SiteTable):
rack_count = tables.Column(accessor=Accessor('count_racks'), orderable=False, verbose_name='Racks')
device_count = tables.Column(accessor=Accessor('count_devices'), orderable=False, verbose_name='Devices')
prefix_count = tables.Column(accessor=Accessor('count_prefixes'), orderable=False, verbose_name='Prefixes')
vlan_count = tables.Column(accessor=Accessor('count_vlans'), orderable=False, verbose_name='VLANs')
circuit_count = tables.Column(accessor=Accessor('count_circuits'), orderable=False, verbose_name='Circuits')
vm_count = tables.Column(accessor=Accessor('count_vms'), orderable=False, verbose_name='VMs')
class Meta(SiteTable.Meta):
fields = (
'pk', 'name', 'status', 'facility', 'region', 'tenant', 'asn', 'rack_count', 'device_count', 'prefix_count',
'vlan_count', 'circuit_count', 'vm_count',
)
# #

2
netbox/dcim/views.py
View File

@ -165,7 +165,7 @@ class SiteListView(ObjectListView):
queryset = Site.objects.select_related('region', 'tenant') queryset = Site.objects.select_related('region', 'tenant')
filter = filters.SiteFilter filter = filters.SiteFilter
filter_form = forms.SiteFilterForm filter_form = forms.SiteFilterForm
table = tables.SiteDetailTable table = tables.SiteTable
template_name = 'dcim/site_list.html' template_name = 'dcim/site_list.html'

10
netbox/templates/dcim/site.html
View File

@ -123,6 +123,16 @@
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
<tr>
<td>Description</td>
<td>
{% if site.description %}
{{ site.description }}
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
</tr>
</table> </table>
</div> </div>
<div class="panel panel-default"> <div class="panel panel-default">