Merge pull request #391 from eReuse/feature/3959-dhid-in-erasure

add dhid as column in erasure section

ereuse_devicehub/inventory/views.py

@@ -939,6 +939,7 @@ class ExportsView(View):
         cw.writerow(
             [
                 'Data Storage Serial',
+                'DHID',
                 'Snapshot ID',
                 'Type of Erasure',
                 'PHID Erasure Host',
@@ -958,6 +959,7 @@ class ExportsView(View):
         for ac in query:
             row = [
                 ac.device.serial_number.upper(),
+                ac.device.dhid,
                 ac.snapshot.uuid,
                 ac.type,
                 ac.get_phid(),

ereuse_devicehub/resources/lot/views.py

@@ -16,7 +16,7 @@ from ereuse_devicehub.db import db
 from ereuse_devicehub.inventory.models import Transfer
 from ereuse_devicehub.query import things_response
 from ereuse_devicehub.resources.action.models import Confirm, Revoke, Trade
-from ereuse_devicehub.resources.device.models import Computer, Device
+from ereuse_devicehub.resources.device.models import Computer, DataStorage, Device
 from ereuse_devicehub.resources.lot.models import Lot, Path
 
 
@@ -302,6 +302,13 @@ class LotDeviceView(LotBaseChildrenView):
         devices = set(
             Device.query.filter(Device.id.in_(ids)).filter(Device.owner == g.user)
         )
+        devices = set()
+        dev_qry = Device.query.filter(Device.id.in_(ids)).filter(Device.owner == g.user)
+
+        for dev in dev_qry:
+            if isinstance(dev, DataStorage) and dev.parent:
+                continue
+            devices.add(dev)
 
         lot.devices.update(devices)
 

ereuse_devicehub/templates/inventory/erasure_list.html

@@ -49,6 +49,7 @@
                     <tr>
                       <th scope="col">Select</th>
                       <th scope="col">Data Storage Serial</th>
+                      <th scope="col">DHID</th>
                       <th scope="col">Snapshot ID</th>
                       <th scope="col">Type of Erasure</th>
                       <th scope="col">PHID Erasure Host</th>
@@ -79,6 +80,15 @@
                         {{ ac.device.serial_number.upper() }}
                         {% endif %}
                       </td>                      
+                      <td>
+                        {% if ac.device.phid() %}
+                        <a href="{{ url_for('inventory.device_details', id=ac.device.dhid)}}">
+                          {{ ac.device.dhid }}
+                        </a>
+                        {% else %}
+                        {{ ac.device.dhid }}
+                        {% endif %}
+                      </td>
                       <td>
                         <a href="{{ url_for('inventory.export', export_id='snapshot') }}?id={{ ac.snapshot.uuid }}">
                           {{ ac.snapshot.uuid }}