trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

get erasure datas form abstract device and drop parent details

This commit is contained in:
Cayo Puigdefabregas 2022-09-02 16:40:35 +02:00
parent 74a8472aa1
commit 74c8a48d6e
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ereuse_devicehub/resources/device/models.py
View File

@ -1049,10 +1049,14 @@ class Computer(Device):
"""Returns the privacy of all ``DataStorage`` components when """Returns the privacy of all ``DataStorage`` components when
it is not None. it is not None.
""" """
components = self.components
if self.placeholder and self.placeholder.binding:
components = self.placeholder.binding.components
return set( return set(
privacy privacy
for privacy in ( for privacy in (
hdd.privacy for hdd in self.components if isinstance(hdd, DataStorage) hdd.privacy for hdd in components if isinstance(hdd, DataStorage)
) )
if privacy if privacy
) )

12
ereuse_devicehub/templates/inventory/erasure.html
View File

@ -40,18 +40,6 @@
<dt>Data storage:</dt> <dt>Data storage:</dt>
<dd>{{ erasure.device.__format__('ts') }}</dd> <dd>{{ erasure.device.__format__('ts') }}</dd>
<dt>Computer where was erase:</dt>
<dd>Title: {{ erasure.parent.__format__('ts') }}</dd>
<dd>DevicehubID: {{ erasure.parent.devicehub_id }}</dd>
<dd>Hid: {{ erasure.parent.hid }}</dd>
<dd>Tags: {{ erasure.parent.tags }}</dd>
<dt>Computer where it resides:</dt>
<dd>Title: {{ erasure.device.parent.__format__('ts') }}</dd>
<dd>DevicehubID: {{ erasure.device.parent.devicehub_id }}</dd>
<dd>Hid: {{ erasure.device.parent.hid }}</dd>
<dd>Tags: {{ erasure.device.parent.tags }}</dd>
<dt>Erasure:</dt> <dt>Erasure:</dt>
<dd>{{ erasure.__format__('ts') }}</dd> <dd>{{ erasure.__format__('ts') }}</dd>
{% if erasure.steps %} {% if erasure.steps %}