Merge branch 'testing' into new-trublo

ereuse_devicehub/resources/device/models.py

@@ -1303,16 +1303,18 @@ class Computer(Device):
     @property
     def ram_size(self) -> int:
         """The total of RAM memory the computer has."""
-        return sum(
+        components = self.components
-            ram.size or 0 for ram in self.components if isinstance(ram, RamModule)
+        if self.placeholder and self.placeholder.binding:
-        )
+            components = self.placeholder.binding.components
+        return sum(ram.size or 0 for ram in components if isinstance(ram, RamModule))
 
     @property
     def data_storage_size(self) -> int:
         """The total of data storage the computer has."""
-        return sum(
+        components = self.components
-            ds.size or 0 for ds in self.components if isinstance(ds, DataStorage)
+        if self.placeholder and self.placeholder.binding:
-        )
+            components = self.placeholder.binding.components
+        return sum(ds.size or 0 for ds in components if isinstance(ds, DataStorage))
 
     @property
     def processor_model(self) -> str:

ereuse_devicehub/static/css/devicehub.css

@@ -23,6 +23,16 @@
     padding-top: 0px;
     padding-bottom: 5px;
 }
+#ApplyDeviceLots {
+    color: #993365;
+    font-weight: bold;
+}
+#ApplyDeviceLots.disabled {
+    color: #adb5bd;
+    font-weight: normal;
+    pointer-events: none;
+    background-color: #fff;
+}
 .help {
     color: #993365;
 }

ereuse_devicehub/templates/inventory/erasure.html

@@ -288,10 +288,10 @@
           {% for erasure in erasures %}
           <tr style="border-bottom: 1px dashed #000;">
             <td>
-              {{ erasure.device.serial_number.upper() }}
+              {{ erasure.device.serial_number and erasure.device.serial_number.upper() or '' }}
             </td>
             <td>
-              {{ erasure.parent.serial_number.upper() }}
+              {{ erasure.parent.serial_number and erasure.parent.serial_number.upper() or '' }}
             </td>
             <td>
               {{ erasure.get_public_name() }}
@@ -320,14 +320,14 @@
      <dt>Computer where was erase:</dt>
   <dd>Title: {{ erasure.parent.__format__('ts') }}</dd>
   <dd>DevicehubID: {{ erasure.parent.dhid }}</dd>
-  <dd>Hid: {{ erasure.parent.hid }}</dd>
+  <dd>Hid: {{ erasure.parent.chid }}</dd>
   <dd>Tags: {{ erasure.parent.tags }}</dd>
 
   {% if erasure.device.parent %}
   <dt>Computer where it resides:</dt>
   <dd>Title: {{ erasure.device.parent.__format__('ts') }}</dd>
   <dd>DevicehubID: {{ erasure.device.parent.dhid }}</dd>
-  <dd>Hid: {{ erasure.device.parent.hid }}</dd>
+  <dd>Hid: {{ erasure.device.parent.chid }}</dd>
   <dd>Tags: {{ erasure.device.parent.tags }}</dd>
   {% endif %}
   {% endif %}