Merge branch 'develop' into develop-2.6

2019-03-05 13:39:00 -05:00
parent 66d9d9d9cb 7294f43fa3
commit c52d077f92
9 changed files with 62 additions and 56 deletions
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -2416,7 +2416,7 @@ class InventoryItem(ComponentModel):

    def to_csv(self):
        return (
-            self.device.name or '{' + self.device.pk + '}',
+            self.device.name or '{{{}}}'.format(self.device.pk),
            self.name,
            self.manufacturer.name if self.manufacturer else None,
            self.part_id,