Merge branch 'develop' into develop-2.10

2020-12-11 16:57:04 -05:00
parent 43d7d5570e 55e8d37fb0
commit a371c08c86
12 changed files with 101 additions and 31 deletions
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -922,7 +922,14 @@ class DeviceTypeForm(BootstrapMixin, CustomFieldModelForm):
            'front_image', 'rear_image', 'comments', 'tags',
        ]
        widgets = {
-            'subdevice_role': StaticSelect2()
+            'subdevice_role': StaticSelect2(),
+            # Exclude SVG images (unsupported by PIL)
+            'front_image': forms.FileInput(attrs={
+                'accept': 'image/bmp,image/gif,image/jpeg,image/png,image/tiff'
+            }),
+            'rear_image': forms.FileInput(attrs={
+                'accept': 'image/bmp,image/gif,image/jpeg,image/png,image/tiff'
+            })
        }