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

fix eraseDataWipe in csv

This commit is contained in:
Cayo Puigdefabregas 2023-05-30 11:49:42 +02:00
parent 80f7d102e1
commit a95d643755
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ereuse_devicehub/resources/documents/device_row.py
View File

@ -429,11 +429,14 @@ class DeviceRow(BaseDeviceRow):
self['{} {} Size (MB)'.format(ctype, i)] = none2str(component.size) self['{} {} Size (MB)'.format(ctype, i)] = none2str(component.size)
component_actions = sorted(component.actions, key=lambda x: x.created) component_actions = [ac for ac in component.actions]
if component.binding:
component_actions.extend(component.binding.device.actions)
component_actions = sorted(component_actions, key=lambda x: x.created)
erasures = [ erasures = [
a a
for a in component_actions for a in component_actions
if a.type in ['EraseBasic', 'EraseSectors', 'DataWipe'] if a.type in ['EraseBasic', 'EraseSectors', 'DataWipe', 'EraseDataWipe']
] ]
erasure = erasures[-1] if erasures else None erasure = erasures[-1] if erasures else None
if not erasure: if not erasure:
@ -441,7 +444,7 @@ class DeviceRow(BaseDeviceRow):
serial_number = none2str(component.serial_number) serial_number = none2str(component.serial_number)
self['Erasure {} {} Serial Number'.format(ctype, i)] = serial_number self['Erasure {} {} Serial Number'.format(ctype, i)] = serial_number
self['Erasure {} {} Size (MB)'.format(ctype, i)] = none2str(component.size) self['Erasure {} {} Size (MB)'.format(ctype, i)] = none2str(component.size)
elif hasattr(erasure, 'type') and erasure.type == 'DataWipe': elif hasattr(erasure, 'type') and erasure.type in ['DataWipe', 'EraseDataWipe']:
self['Erasure {} {}'.format(ctype, i)] = none2str(component.chid) self['Erasure {} {}'.format(ctype, i)] = none2str(component.chid)
serial_number = none2str(component.serial_number) serial_number = none2str(component.serial_number)
self['Erasure {} {} Serial Number'.format(ctype, i)] = serial_number self['Erasure {} {} Serial Number'.format(ctype, i)] = serial_number