Sfoglia il codice sorgente

Fixes #2961: Prevent exception when exporting inventory items belonging to unnamed devices

Jeremy Stretch 7 anni fa
parent
commit
6406e213bd
2 ha cambiato i file con 2 aggiunte e 1 eliminazioni
  1. 1 0
      CHANGELOG.md
  2. 1 1
      netbox/dcim/models.py

+ 1 - 0
CHANGELOG.md

@@ -9,6 +9,7 @@ v2.5.8 (FUTURE)
 * [#2939](https://github.com/digitalocean/netbox/issues/2939) - Exclude circuit terminations from API interface connections endpoint
 * [#2952](https://github.com/digitalocean/netbox/issues/2952) - Added the `slug` field to the Tenant filter for use in the API and search function
 * [#2954](https://github.com/digitalocean/netbox/issues/2954) - Remove trailing slashes to fix root/template paths on Windows
+* [#2961](https://github.com/digitalocean/netbox/issues/2961) - Prevent exception when exporting inventory items belonging to unnamed devices
 * [#2962](https://github.com/digitalocean/netbox/issues/2962) - Increase ExportTemplate `mime_type` field length
 
 ---

+ 1 - 1
netbox/dcim/models.py

@@ -2423,7 +2423,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,