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

Merge pull request #421 from eReuse/bugfix/4206-donalo-incoming 

Bugfix/4206 donalo incoming
This commit is contained in:
cayop 2023-01-11 10:49:20 +01:00 committed by GitHub
parent 8a8feb3165 a265af8864
commit b77c81c16a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -778,6 +778,8 @@ class Device(Thing):
def change_owner(self, new_user): def change_owner(self, new_user):
"""util for change the owner one device""" """util for change the owner one device"""
if not new_user:
return
self.owner = new_user self.owner = new_user
if hasattr(self, 'components'): if hasattr(self, 'components'):
for c in 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 * @returns get lots
*/ */
async 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; if (request != undefined) return request.items;
throw request; throw request;
}, },

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

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