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

Merge branch 'develop-2.4' into 1898-activity-logging

Browse Source
This commit is contained in:
Jeremy Stretch
2018-06-21 16:53:15 -04:00
parent e1055b7f97 b945dec41b
commit 9d419de9dc
20 changed files with 294 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/dcim/models.py
View File

@@ -136,6 +136,18 @@ class Site(ChangeLoggedModel, CustomFieldModel):
max_length=200,
blank=True
)
latitude = models.DecimalField(
max_digits=8,
decimal_places=6,
blank=True,
null=True
)
longitude = models.DecimalField(
max_digits=9,
decimal_places=6,
blank=True,
null=True
)
contact_name = models.CharField(
max_length=50,
blank=True
@@ -166,7 +178,7 @@ class Site(ChangeLoggedModel, CustomFieldModel):
serializer = 'dcim.api.serializers.SiteSerializer'
csv_headers = [
'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'description', 'physical_address',
'shipping_address', 'contact_name', 'contact_phone', 'contact_email', 'comments',
'shipping_address', 'latitude', 'longitude', 'contact_name', 'contact_phone', 'contact_email', 'comments',
]
class Meta:
@@ -191,6 +203,8 @@ class Site(ChangeLoggedModel, CustomFieldModel):
self.description,
self.physical_address,
self.shipping_address,
self.latitude,
self.longitude,
self.contact_name,
self.contact_phone,
self.contact_email,