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

Update model ordering parameters to ensure deterministic ordering

Browse Source
This commit is contained in:
Jeremy Stretch
2020-01-15 13:20:44 -05:00
parent c202c1325b
commit 28350d84f9
8 changed files with 125 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/extras/models.py
View File

@@ -120,6 +120,7 @@ class Webhook(models.Model):
)
class Meta:
ordering = ('name',)
unique_together = ('payload_url', 'type_create', 'type_update', 'type_delete',)
def __str__(self):
@@ -308,8 +309,8 @@ class CustomFieldValue(models.Model):
)
class Meta:
ordering = ['obj_type', 'obj_id']
unique_together = ['field', 'obj_type', 'obj_id']
ordering = ('obj_type', 'obj_id', 'pk') # (obj_type, obj_id) may be non-unique
unique_together = ('field', 'obj_type', 'obj_id')
def __str__(self):
return '{} {}'.format(self.obj, self.field)
@@ -454,7 +455,7 @@ class Graph(models.Model):
)
class Meta:
ordering = ['type', 'weight', 'name']
ordering = ('type', 'weight', 'name', 'pk') # (type, weight, name) may be non-unique
def __str__(self):
return self.name
@@ -623,7 +624,7 @@ class ImageAttachment(models.Model):
)
class Meta:
ordering = ['name']
ordering = ('name', 'pk') # name may be non-unique
def __str__(self):
if self.name: