diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 9682e0c1..567196eb 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -166,10 +166,14 @@ class DeviceDetailView(GenericMixin): ) form_tags = TagDeviceForm(dhid=id) + placeholder = device.binding or device.placeholder + if not placeholder: + return NotFound() + self.context.update( { 'device': device, - 'placeholder': device.binding or device.placeholder, + 'placeholder': placeholder, 'page_title': 'Device {}'.format(device.devicehub_id), 'form_tag_device': form_tags, } diff --git a/ereuse_devicehub/templates/inventory/erasure_list.html b/ereuse_devicehub/templates/inventory/erasure_list.html index 2d93d4bd..57f91b75 100644 --- a/ereuse_devicehub/templates/inventory/erasure_list.html +++ b/ereuse_devicehub/templates/inventory/erasure_list.html @@ -71,9 +71,13 @@ /> + {% if ac.device.phid() %} {{ ac.device.serial_number.upper() }} + {% else %} + {{ ac.device.serial_number.upper() }} + {% endif %}