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

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

This commit is contained in:
Cayo Puigdefabregas 2023-01-11 17:18:52 +01:00
parent bc12258db0 b77c81c16a
commit ac4e87d2b3
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ereuse_devicehub/resources/device/models.py
View File

@ -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:

2
ereuse_devicehub/static/js/api.js
View File

@ -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;
},

2
ereuse_devicehub/static/js/main_inventory.build.js
View File

@ -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");

2
ereuse_devicehub/static/js/main_inventory.js
View File

@ -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");

2
ereuse_devicehub/workbench/__init__.py
View File

@ -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": {