From 2543f7f7610db715b3a073cfdf07baacc2a4a2fd Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 9 Jun 2023 18:17:06 +0200 Subject: [PATCH 1/5] add datastorage placeholders --- ereuse_devicehub/inventory/forms.py | 27 +++++++++++++++++-- ereuse_devicehub/static/js/create_device.js | 26 ++++++++++++++---- .../templates/inventory/device_create.html | 21 ++++++++++++++- 3 files changed, 66 insertions(+), 8 deletions(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 6c2b428c..0d644565 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -55,9 +55,11 @@ from ereuse_devicehub.resources.device.models import ( DataStorage, Desktop, Device, + HardDrive, Keyboard, Laptop, MemoryCardReader, + Mobile, Monitor, Mouse, Other, @@ -65,6 +67,7 @@ from ereuse_devicehub.resources.device.models import ( Projector, Server, Smartphone, + SolidStateDrive, Tablet, TelevisionSet, ) @@ -100,7 +103,7 @@ DEVICES = { "Drives & Storage": [ "All DataStorage", "HardDrive", - "SolidStageDrive", + "SolidStateDrive", ], "Accessories": [ "All Accessories", @@ -128,6 +131,7 @@ MOBILE = ["Mobile", "Tablet", "Smartphone", "Cellphone"] STORAGE = ["HardDrive", "SolidStateDrive"] ACCESSORIES = ["Mouse", "MemoryCardReader", "SAI", "Keyboard"] OTHERS = ["Other"] +DATASTORAGE = ['HardDrive', 'SolidStateDrive'] class AdvancedSearchForm(FlaskForm): @@ -202,7 +206,7 @@ class FilterForm(FlaskForm): # Generic Filters if "All Devices" == self.device_type: - filter_type = COMPUTERS + MONITORS + MOBILE + OTHERS + filter_type = COMPUTERS + MONITORS + MOBILE + DATASTORAGE + OTHERS elif "All Computers" == self.device_type: filter_type = COMPUTERS @@ -398,6 +402,7 @@ class NewDeviceForm(FlaskForm): sku = StringField('SKU', [validators.Optional()]) image = URLField('Image', [validators.Optional(), validators.URL()]) imei = IntegerField('IMEI', [validators.Optional()]) + data_storage_size = IntegerField('Storage Size', [validators.Optional()]) meid = StringField('MEID', [validators.Optional()]) resolution = IntegerField('Resolution width', [validators.Optional()]) screen = FloatField('Screen size', [validators.Optional()]) @@ -417,6 +422,8 @@ class NewDeviceForm(FlaskForm): "Smartphone": Smartphone, "Tablet": Tablet, "Cellphone": Cellphone, + "HardDrive": HardDrive, + "SolidStateDrive": SolidStateDrive, "ComputerMonitor": ComputerMonitor, "Monitor": Monitor, "TelevisionSet": TelevisionSet, @@ -465,6 +472,7 @@ class NewDeviceForm(FlaskForm): if self._obj.type in ['Smartphone', 'Tablet', 'Cellphone']: self.imei.data = self._obj.imei self.meid.data = self._obj.meid + self.data_storage_size.data = self._obj.data_storage_size if self._obj.type == 'ComputerMonitor': self.resolution.data = self._obj.resolution_width self.screen.data = self._obj.size @@ -492,6 +500,7 @@ class NewDeviceForm(FlaskForm): if self._obj.type in ['Smartphone', 'Tablet', 'Cellphone']: self.imei.render_kw = disabled self.meid.render_kw = disabled + self.data_storage_size.render_kw = disabled if self._obj.type == 'ComputerMonitor': self.resolution.render_kw = disabled self.screen.render_kw = disabled @@ -561,6 +570,7 @@ class NewDeviceForm(FlaskForm): if commit: db.session.commit() + # import pdb; pdb.set_trace() def create_device(self): schema = SnapshotSchema() @@ -604,6 +614,10 @@ class NewDeviceForm(FlaskForm): if self.type.data in ['Smartphone', 'Tablet', 'Cellphone']: device.imei = self.imei.data device.meid = self.meid.data + device.data_storage_size = self.data_storage_size.data + + if self.type.data in ['HardDrive', 'SolidStateDrive']: + device.data_storage_size = self.data_storage_size.data device.image = URL(self.image.data) @@ -672,6 +686,7 @@ class NewDeviceForm(FlaskForm): if self._obj.type in ['Smartphone', 'Tablet', 'Cellphone']: self._obj.imei = self.imei.data self._obj.meid = self.meid.data + self._obj.data_storage_size = self.data_storage_size.data if ( self.appearance.data @@ -1084,6 +1099,14 @@ class DataWipeForm(ActionFormMixin): del self.document for dev in self._devices: ac = None + if isinstance(dev, Mobile) or isinstance(dev, DataStorage): + ac = Model() + self.populate_obj(ac) + ac.device_id = dev.id + ac.document = document.form._obj + db.session.add(ac) + continue + for hd in dev.components: if not isinstance(hd, DataStorage): continue diff --git a/ereuse_devicehub/static/js/create_device.js b/ereuse_devicehub/static/js/create_device.js index 4acece0f..34965cf6 100644 --- a/ereuse_devicehub/static/js/create_device.js +++ b/ereuse_devicehub/static/js/create_device.js @@ -1,28 +1,44 @@ $(document).ready(() => { - $("#type").on("change", deviceInputs); - $("#amount").on("change", amountInputs); + $("#type").on("change", deviceInputs2); + $("#amount").on("change", deviceInputs2); + deviceInputs2() +}) + +function deviceInputs2() { deviceInputs(); amountInputs(); -}) +} function deviceInputs() { if ($("#type").val() == "ComputerMonitor") { $("#screen").show(); $("#resolution").show(); + $("#components2").hide(); $("#imei").hide(); $("#meid").hide(); + $("#data_storage_size").hide(); } else if (["Smartphone", "Cellphone", "Tablet"].includes($("#type").val())) { $("#screen").hide(); $("#resolution").hide(); + $("#components2").hide(); $("#imei").show(); $("#meid").show(); + $("#data_storage_size").show(); + } else if (["HardDrive", "SolidStateDrive"].includes($("#type").val())) { + $("#screen").hide(); + $("#resolution").hide(); + $("#components2").hide(); + $("#imei").hide(); + $("#meid").hide(); + $("#data_storage_size").show(); } else { $("#screen").hide(); $("#resolution").hide(); $("#imei").hide(); $("#meid").hide(); + $("#data_storage_size").hide(); + $("#components2").show(); }; - amountInputs(); } function amountInputs() { @@ -35,6 +51,7 @@ function amountInputs() { $("#Sku").hide(); $("#imei").hide(); $("#meid").hide(); + $("#data_storage_size").hide(); } else { $("#Phid").show(); $("#Id_device_supplier").show(); @@ -42,6 +59,5 @@ function amountInputs() { $("#Serial_number").show(); $("#Part_number").show(); $("#Sku").show(); - deviceInputs(); }; } diff --git a/ereuse_devicehub/templates/inventory/device_create.html b/ereuse_devicehub/templates/inventory/device_create.html index 8ad8634a..3de677c9 100644 --- a/ereuse_devicehub/templates/inventory/device_create.html +++ b/ereuse_devicehub/templates/inventory/device_create.html @@ -62,6 +62,12 @@ + + + + @@ -152,7 +158,7 @@ {% endif %} -
+
{{ form.components(class_="form-control") }} Description of components @@ -434,6 +440,19 @@ {% endif %}
+
+ + {{ form.data_storage_size(class_="form-control") }} + Size in GB. + {% if form.data_storage_size.errors %} +

+ {% for error in form.data_storage_size.errors %} + {{ error }}
+ {% endfor %} +

+ {% endif %} +
+
{{ form.resolution(class_="form-control") }} From 6aa643c197768f5ba2c96c9d96ddf280643db5b1 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 12 Jun 2023 17:38:32 +0200 Subject: [PATCH 2/5] mobile datawipe in csv report and pdf certificate --- ereuse_devicehub/inventory/views.py | 21 ++++++-- ereuse_devicehub/resources/device/models.py | 49 ++++++++++++++++++- .../resources/documents/device_row.py | 23 +++++++++ .../templates/inventory/erasure.html | 30 +++++++++++- 4 files changed, 116 insertions(+), 7 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index c00a8cb1..3f4a52e3 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -47,6 +47,7 @@ from ereuse_devicehub.resources.device.models import ( Computer, DataStorage, Device, + Mobile, Placeholder, ) from ereuse_devicehub.resources.documents.device_row import ActionRow, DeviceRow @@ -1198,6 +1199,10 @@ class ExportsView(View): ac = device.last_erase_action if ac: erasures.append(ac) + elif isinstance(device, Mobile): + ac = device.last_erase_action + if ac: + erasures.append(ac) return erasures def get_costum_details(self, erasures): @@ -1241,15 +1246,19 @@ class ExportsView(View): def get_server_erasure_hosts(self, erasures): erasures_host = [] + erasures_mobile = [] erasures_on_server = [] for erase in erasures: try: + if isinstance(erase.device, Mobile): + erasures_mobile.append(erase.device) + continue if erase.parent.binding.kangaroo: erasures_host.append(erase.parent) erasures_on_server.append(erase) except Exception: pass - return erasures_host, erasures_on_server + return erasures_host, erasures_on_server, erasures_mobile def build_erasure_certificate(self): erasures = self.get_datastorages() @@ -1261,9 +1270,10 @@ class ExportsView(View): my_data, customer_details = self.get_costum_details(erasures) - a, b = self.get_server_erasure_hosts(erasures) - erasures_host, erasures_on_server = a, b + a, b, c = self.get_server_erasure_hosts(erasures) + erasures_host, erasures_on_server, erasures_mobile = a, b, c erasures_host = set(erasures_host) + erasures_mobile = set(erasures_mobile) result_success = 0 result_failed = 0 @@ -1278,7 +1288,8 @@ class ExportsView(View): erasures_on_server = sorted(erasures_on_server, key=lambda x: x.end_time) erasures_normal = list(set(erasures) - set(erasures_on_server)) erasures_normal = sorted(erasures_normal, key=lambda x: x.end_time) - n_computers = len({x.parent for x in erasures} - erasures_host) + n_computers = len({x.parent for x in erasures if x.parent} - erasures_host) + n_mobiles = len(erasures_mobile) params = { 'title': 'Device Sanitization', @@ -1289,10 +1300,12 @@ class ExportsView(View): 'software': software, 'my_data': my_data, 'n_computers': n_computers, + 'n_mobiles': n_mobiles, 'result_success': result_success, 'result_failed': result_failed, 'customer_details': customer_details, 'erasure_hosts': erasures_host, + 'erasure_mobiles': erasures_mobile, 'erasures_normal': erasures_normal, } return flask.render_template('inventory/erasure.html', **params) diff --git a/ereuse_devicehub/resources/device/models.py b/ereuse_devicehub/resources/device/models.py index e6662f26..ca7ea9be 100644 --- a/ereuse_devicehub/resources/device/models.py +++ b/ereuse_devicehub/resources/device/models.py @@ -1066,6 +1066,9 @@ class Device(Thing): return lot return None + def is_mobile(self): + return isinstance(self, Mobile) + def __lt__(self, other): return self.id < other.id @@ -1375,11 +1378,11 @@ class Computer(Device): @property def external_document_erasure(self): """Returns the external ``DataStorage`` proof of erasure.""" - from ereuse_devicehub.resources.action.models import DataWipe + from ereuse_devicehub.resources.action.models import EraseDataWipe urls = set() try: - ev = self.last_action_of(DataWipe) + ev = self.last_action_of(EraseDataWipe) urls.add(ev.document.url.to_text()) except LookupError: pass @@ -1490,6 +1493,48 @@ class Mobile(Device): raise ValidationError('{} is not a valid meid.'.format(value)) return value + @property + def last_erase_action(self): + erase_auto = None + erase_manual = None + + if self.binding: + erase_auto = self.privacy + erase_manual = self.binding.device.privacy + if self.placeholder: + erase_manual = self.privacy + if self.placeholder.binding: + erase_auto = self.placeholder.binding.privacy + + if erase_auto and erase_manual: + return ( + erase_auto + if erase_auto.created > erase_manual.created + else erase_manual + ) + if erase_manual: + return erase_manual + if erase_auto: + return erase_auto + return None + + @property + def privacy(self): + """Returns the privacy compliance state of the data storage. + + This is, the last erasure performed to the data storage. + """ + from ereuse_devicehub.resources.action.models import EraseBasic + + try: + ev = self.last_action_of(EraseBasic) + except LookupError: + ev = None + return ev + + def get_size(self): + return self.data_storage_size + class Smartphone(Mobile): pass diff --git a/ereuse_devicehub/resources/documents/device_row.py b/ereuse_devicehub/resources/documents/device_row.py index edb1282f..b9d6c219 100644 --- a/ereuse_devicehub/resources/documents/device_row.py +++ b/ereuse_devicehub/resources/documents/device_row.py @@ -343,6 +343,7 @@ class DeviceRow(BaseDeviceRow): if isinstance(device, d.Mobile): self['IMEI'] = device.imei or '' + self.get_erasure_datawipe_mobile(device) def components(self): """Function to get all components information of a device.""" @@ -417,6 +418,24 @@ class DeviceRow(BaseDeviceRow): self['{} {} Size (MB)'.format(ctype, i)] = none2str(component.size) self['{} {} Speed (MHz)'.format(ctype, i)] = none2str(component.speed) + def get_erasure_datawipe_mobile(self, device): + actions = sorted(device.actions) + erasures = [a for a in actions if a.type == 'EraseDataWipe'] + erasure = erasures[-1] if erasures else None + if erasure: + self['Erasure DataStorage 1'] = none2str(device.chid) + serial_number = none2str(device.imei) + storage_size = none2str(device.data_storage_size) + self['Erasure DataStorage 1 Serial Number'] = serial_number + self['Erasure DataStorage 1 Size (MB)'] = storage_size + self['Erasure DataStorage 1 Software'] = erasure.document.software + self['Erasure DataStorage 1 Result'] = get_result(erasure) + self['Erasure DataStorage 1 Type'] = erasure.type + self['Erasure DataStorage 1 Date'] = format(erasure.document.date or '') + self['Erasure DataStorage 1 Certificate URL'] = ( + erasure.document.url and erasure.document.url.to_text() or '' + ) + def get_datastorage(self, ctype, i, component): """Particular fields for component DataStorage. A DataStorage can be HardDrive or SolidStateDrive. @@ -455,6 +474,10 @@ class DeviceRow(BaseDeviceRow): self['Erasure {} {} Size (MB)'.format(ctype, i)] = none2str(component.size) self['Erasure {} {} Software'.format(ctype, i)] = erasure.document.software self['Erasure {} {} Result'.format(ctype, i)] = get_result(erasure) + self['Erasure {} {} Type'.format(ctype, i)] = erasure.type + self['Erasure {} {} Date'.format(ctype, i)] = format( + erasure.document.date or '' + ) self['Erasure {} {} Certificate URL'.format(ctype, i)] = ( erasure.document.url and erasure.document.url.to_text() or '' ) diff --git a/ereuse_devicehub/templates/inventory/erasure.html b/ereuse_devicehub/templates/inventory/erasure.html index 5674ae9c..15ed5db6 100644 --- a/ereuse_devicehub/templates/inventory/erasure.html +++ b/ereuse_devicehub/templates/inventory/erasure.html @@ -209,6 +209,16 @@ {% endif %} + {% if n_mobiles %} + + + N° of mobiles: + + + {{ n_mobiles }} + + + {% endif %} N° of data storage unit(s): @@ -322,12 +332,20 @@ {% for erasure in erasures %} + {% if erasure.device.is_mobile() %} + + {{ (erasure.device.imei or '') }} + + + + {% else %} {{ (erasure.device.serial_number or '').upper() }} {{ (erasure.parent.serial_number or '').upper() }} + {% endif %} {{ erasure.get_public_name() }} @@ -351,12 +369,21 @@

Technical Details

{% endif %} + {% if erasure.device.is_mobile() %} +

{{ (erasure.device.imei or '') }}

+
+
Mobile Drive:
+
Model: {{ erasure.device.model }}
+
IMEI: {{ (erasure.device.imei or '') }}
+
DHID: {{ erasure.device.dhid }}
+
Size: {{ erasure.device.get_size() or '' }}
+ {% else %}

{{ (erasure.device.serial_number or '').upper() }}

Storage Drive:
Model: {{ erasure.device.model }}
SN: {{ (erasure.device.serial_number or '').upper() }}
-
Size: {{ erasure.device.get_size()}}
+
Size: {{ erasure.device.get_size() or '' }}
{% if erasure.parent %}
Computer Host:
@@ -364,6 +391,7 @@
SN: {{ (erasure.parent.serial_number or '').upper() }}
DHID: {{ erasure.parent.dhid }}
{% endif %} + {% endif %}
Erasure:
From 57882ca2c5e60e4d59bb63e366ba4fbec4f408c2 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 12 Jun 2023 18:47:55 +0200 Subject: [PATCH 3/5] add placeholder datastorage --- ereuse_devicehub/inventory/forms.py | 17 +++++++++++++---- .../templates/inventory/erasure.html | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 0d644565..22666a3a 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -402,7 +402,7 @@ class NewDeviceForm(FlaskForm): sku = StringField('SKU', [validators.Optional()]) image = URLField('Image', [validators.Optional(), validators.URL()]) imei = IntegerField('IMEI', [validators.Optional()]) - data_storage_size = IntegerField('Storage Size', [validators.Optional()]) + data_storage_size = FloatField('Storage Size', [validators.Optional()]) meid = StringField('MEID', [validators.Optional()]) resolution = IntegerField('Resolution width', [validators.Optional()]) screen = FloatField('Screen size', [validators.Optional()]) @@ -435,7 +435,7 @@ class NewDeviceForm(FlaskForm): "Other": Other, } - def reset_from_obj(self): + def reset_from_obj(self): # noqa: C901 if not self._obj: return disabled = {'disabled': "disabled"} @@ -476,6 +476,9 @@ class NewDeviceForm(FlaskForm): if self._obj.type == 'ComputerMonitor': self.resolution.data = self._obj.resolution_width self.screen.data = self._obj.size + if self._obj.type in ['HardDrive', 'SolidStateDrive']: + if self._obj.size: + self.data_storage_size.data = self._obj.size / 1000 if self._obj.placeholder.is_abstract: self.type.render_kw = disabled @@ -501,6 +504,8 @@ class NewDeviceForm(FlaskForm): self.imei.render_kw = disabled self.meid.render_kw = disabled self.data_storage_size.render_kw = disabled + if self._obj.type in ['HardDrive', 'SolidStateDrive']: + self.data_storage_size.render_kw = disabled if self._obj.type == 'ComputerMonitor': self.resolution.render_kw = disabled self.screen.render_kw = disabled @@ -570,7 +575,6 @@ class NewDeviceForm(FlaskForm): if commit: db.session.commit() - # import pdb; pdb.set_trace() def create_device(self): schema = SnapshotSchema() @@ -617,7 +621,8 @@ class NewDeviceForm(FlaskForm): device.data_storage_size = self.data_storage_size.data if self.type.data in ['HardDrive', 'SolidStateDrive']: - device.data_storage_size = self.data_storage_size.data + if self.data_storage_size.data: + self._obj.size = self.data_storage_size.data * 1000 device.image = URL(self.image.data) @@ -688,6 +693,10 @@ class NewDeviceForm(FlaskForm): self._obj.meid = self.meid.data self._obj.data_storage_size = self.data_storage_size.data + if self.type.data in ['HardDrive', 'SolidStateDrive']: + if self.data_storage_size.data: + self._obj.size = self.data_storage_size.data * 1000 + if ( self.appearance.data and self.appearance.data != self._obj.appearance().name diff --git a/ereuse_devicehub/templates/inventory/erasure.html b/ereuse_devicehub/templates/inventory/erasure.html index 15ed5db6..73d201a9 100644 --- a/ereuse_devicehub/templates/inventory/erasure.html +++ b/ereuse_devicehub/templates/inventory/erasure.html @@ -334,7 +334,7 @@ {% if erasure.device.is_mobile() %} - {{ (erasure.device.imei or '') }} + IMEI:{{ (erasure.device.imei or '') }} @@ -376,7 +376,7 @@
Model: {{ erasure.device.model }}
IMEI: {{ (erasure.device.imei or '') }}
DHID: {{ erasure.device.dhid }}
-
Size: {{ erasure.device.get_size() or '' }}
+
Size: {{ erasure.device.get_size() or '?' }} GB
{% else %}

{{ (erasure.device.serial_number or '').upper() }}

From dc07b4973b999f6a5beadee9ef1ee88f3b572bfc Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 13 Jun 2023 08:53:17 +0200 Subject: [PATCH 4/5] add datastorage to csv --- .../resources/documents/device_row.py | 15 +++++++++++++-- .../templates/inventory/erasure_list.html | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ereuse_devicehub/resources/documents/device_row.py b/ereuse_devicehub/resources/documents/device_row.py index b9d6c219..31867a64 100644 --- a/ereuse_devicehub/resources/documents/device_row.py +++ b/ereuse_devicehub/resources/documents/device_row.py @@ -345,6 +345,9 @@ class DeviceRow(BaseDeviceRow): self['IMEI'] = device.imei or '' self.get_erasure_datawipe_mobile(device) + if isinstance(device, d.DataStorage): + self.get_erasure_datawipe_mobile(device) + def components(self): """Function to get all components information of a device.""" assert isinstance(self.device, d.Computer) @@ -424,8 +427,16 @@ class DeviceRow(BaseDeviceRow): erasure = erasures[-1] if erasures else None if erasure: self['Erasure DataStorage 1'] = none2str(device.chid) - serial_number = none2str(device.imei) - storage_size = none2str(device.data_storage_size) + if isinstance(device, d.Mobile): + serial_number = none2str(device.imei) + size = device.data_storage_size + size = size * 1000 if size else 0 + storage_size = none2str(size) + + if isinstance(device, d.DataStorage): + serial_number = none2str(device.serial_number) + storage_size = none2str(device.size) + self['Erasure DataStorage 1 Serial Number'] = serial_number self['Erasure DataStorage 1 Size (MB)'] = storage_size self['Erasure DataStorage 1 Software'] = erasure.document.software diff --git a/ereuse_devicehub/templates/inventory/erasure_list.html b/ereuse_devicehub/templates/inventory/erasure_list.html index 0e57e9f9..2449686b 100644 --- a/ereuse_devicehub/templates/inventory/erasure_list.html +++ b/ereuse_devicehub/templates/inventory/erasure_list.html @@ -162,6 +162,7 @@ {% for ac in erasure.items %} + {% if not ac.device.is_mobile() %} + {% endif %} {% endfor %} From 314e944208dee743ae5b5a85144e14759237fd51 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 13 Jun 2023 11:07:24 +0200 Subject: [PATCH 5/5] fix bug --- ereuse_devicehub/inventory/forms.py | 2 +- .../templates/inventory/upload_placeholder.html | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 22666a3a..4cab06c5 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -622,7 +622,7 @@ class NewDeviceForm(FlaskForm): if self.type.data in ['HardDrive', 'SolidStateDrive']: if self.data_storage_size.data: - self._obj.size = self.data_storage_size.data * 1000 + device.size = self.data_storage_size.data * 1000 device.image = URL(self.image.data) diff --git a/ereuse_devicehub/templates/inventory/upload_placeholder.html b/ereuse_devicehub/templates/inventory/upload_placeholder.html index 6291589d..7763cd43 100644 --- a/ereuse_devicehub/templates/inventory/upload_placeholder.html +++ b/ereuse_devicehub/templates/inventory/upload_placeholder.html @@ -56,6 +56,12 @@ + + + +