Merge branch 'develop' into develop-2.3

2024-05-10 07:54:54 +00:00 · 2018-01-19 10:54:26 -05:00
parent fc7a43f23e 5262156e1a
commit 0714a40509
29 changed files with 186 additions and 113 deletions
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -139,6 +139,7 @@ class Cluster(CreatedUpdatedModel, CustomFieldModel):
            self.name,
            self.type.name,
            self.group.name if self.group else None,
+            self.site.name if self.site else None,
            self.comments,
        ])