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' into develop-2.8

Browse Source
This commit is contained in:
Jeremy Stretch
2020-03-10 15:06:37 -04:00
parent 803287a514 55558cb272
commit 0de857bf7a
156 changed files with 1561 additions and 1674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/ipam/models.py
View File

@@ -1021,7 +1021,7 @@ class Service(ChangeLoggedModel, CustomFieldModel):
tags = TaggableManager(through=TaggedItem)
csv_headers = ['device', 'virtual_machine', 'name', 'protocol', 'description']
csv_headers = ['device', 'virtual_machine', 'name', 'protocol', 'port', 'description']
class Meta:
ordering = ('protocol', 'port', 'pk') # (protocol, port) may be non-unique