diff --git a/ereuse_devicehub/resources/device/models.py b/ereuse_devicehub/resources/device/models.py index 784ddc61..f9335d59 100644 --- a/ereuse_devicehub/resources/device/models.py +++ b/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: diff --git a/ereuse_devicehub/static/js/api.js b/ereuse_devicehub/static/js/api.js index 552544d2..4baa1d78 100644 --- a/ereuse_devicehub/static/js/api.js +++ b/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; }, diff --git a/ereuse_devicehub/static/js/main_inventory.build.js b/ereuse_devicehub/static/js/main_inventory.build.js index 546f398c..0032f649 100644 --- a/ereuse_devicehub/static/js/main_inventory.build.js +++ b/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"); diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js index dc0a09a7..f5c50241 100644 --- a/ereuse_devicehub/static/js/main_inventory.js +++ b/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"); diff --git a/ereuse_devicehub/workbench/__init__.py b/ereuse_devicehub/workbench/__init__.py index 7a54c4a2..8f9bf153 100644 --- a/ereuse_devicehub/workbench/__init__.py +++ b/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": {