Просмотр исходного кода

Merge pull request #4689 from kobayashi/4684-devicetype-import-comment

Fixes #4684: Fix ignored comment when importing DeviceType
Jeremy Stretch 5 лет назад
Родитель
Сommit
faf3885775
3 измененных файлов с 4 добавлено и 0 удалено
  1. 1 0
      docs/release-notes/version-2.8.md
  2. 1 0
      netbox/dcim/forms.py
  3. 2 0
      netbox/dcim/tests/test_views.py

+ 1 - 0
docs/release-notes/version-2.8.md

@@ -19,6 +19,7 @@
 * [#4648](https://github.com/netbox-community/netbox/issues/4648) - Fix bulk CSV import of child devices
 * [#4649](https://github.com/netbox-community/netbox/issues/4649) - Fix interface assignment for bulk-imported IP addresses
 * [#4676](https://github.com/netbox-community/netbox/issues/4676) - Set default value of `REMOTE_AUTH_AUTO_CREATE_USER` as `False` in docs
+* [#4684](https://github.com/netbox-community/netbox/issues/4684) - Respect `comments` field when importing device type in YAML/JSON format
 
 ---
 

+ 1 - 0
netbox/dcim/forms.py

@@ -932,6 +932,7 @@ class DeviceTypeImportForm(BootstrapMixin, forms.ModelForm):
         model = DeviceType
         fields = [
             'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'subdevice_role',
+            'comments',
         ]
 
 

+ 2 - 0
netbox/dcim/tests/test_views.py

@@ -366,6 +366,7 @@ manufacturer: Generic
 model: TEST-1000
 slug: test-1000
 u_height: 2
+comments: test comment
 console-ports:
   - name: Console Port 1
     type: de-9
@@ -456,6 +457,7 @@ device-bays:
         self.assertHttpStatus(response, 200)
 
         dt = DeviceType.objects.get(model='TEST-1000')
+        self.assertEqual(dt.comments, 'test comment')
 
         # Verify all of the components were created
         self.assertEqual(dt.consoleport_templates.count(), 3)