Merge branch 'testing' into changes/4025-new-hid

ereuse_devicehub/resources/device/models.py

@@ -834,6 +834,8 @@ class Device(Thing):
 
     def change_owner(self, new_user):
         """util for change the owner one device"""
+        if not new_user:
+            return
         self.owner = new_user
         if hasattr(self, 'components'):
             for c in self.components:

ereuse_devicehub/static/js/api.js

@@ -4,7 +4,7 @@ const Api = {
      * @returns get lots
      */
     async get_lots() {
-        const request = await this.doRequest(`${API_URLS.lots}?type=temporary`, "GET", null);
+        const request = await this.doRequest(`${API_URLS.lots}`, "GET", null);
         if (request != undefined) return request.items;
         throw request;
     },

ereuse_devicehub/static/js/main_inventory.build.js

@@ -665,7 +665,7 @@ async function processSelectedDevices() {
     });
 
     listHTML.html("");
-    const lot_temporary = lots.filter(lot => !lot.transfer);
+    const lot_temporary = lots.filter(lot => !lot.transfer && !lot.trade);
     appendMenu(lot_temporary, listHTML, templateLot, selectedDevices, actions, "Temporary");
 
     const lot_incoming = lots.filter(lot => lot.transfer && lot.transfer == "Incoming");

ereuse_devicehub/static/js/main_inventory.js

@@ -627,7 +627,7 @@ async function processSelectedDevices() {
         })
 
         listHTML.html("");
-        const lot_temporary = lots.filter(lot => !lot.transfer);
+        const lot_temporary = lots.filter(lot => !lot.transfer && !lot.trade);
         appendMenu(lot_temporary, listHTML, templateLot, selectedDevices, actions, "Temporary");
 
         const lot_incoming = lots.filter(lot => lot.transfer && lot.transfer == "Incoming");

ereuse_devicehub/workbench/__init__.py

@@ -4,7 +4,7 @@ isos = {
         'url': 'https://releases.usody.com/demo/',
     },
     "register": {
-        'iso': "USODY_2022.8.0-beta.iso",
+        'iso': "USODY_2022.12.1-beta.iso",
         'url': 'https://releases.usody.com/2022/',
     },
     "erease": {