verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Guillermo Bonet 2024-10-06 09:13:07 +02:00
parent 4b497108dc 4a17d9ec0e
commit 12bf7f07c5
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
db/routines/vn/procedures/collection_assign.sql
View File

@ -118,9 +118,19 @@ BEGIN
IF vCollectionFk IS NULL THEN IF vCollectionFk IS NULL THEN
CALL collection_new(vUserFk, vCollectionFk); CALL collection_new(vUserFk, vCollectionFk);
UPDATE `collection` START TRANSACTION;
SET workerFk = vUserFk
WHERE id = vCollectionFk; SELECT workerFk INTO vCollectionWorker
FROM `collection`
WHERE id = vCollectionFk FOR UPDATE;
IF vCollectionWorker IS NULL THEN
UPDATE `collection`
SET workerFk = vUserFk
WHERE id = vCollectionFk;
END IF;
COMMIT;
END IF; END IF;
END$$ END$$
DELIMITER ; DELIMITER ;

6
front/core/services/app.js
View File

@ -66,15 +66,15 @@ export default class App {
]} ]}
}; };
const hasId = !isNaN(parseInt(route.split('/')[1]));
if (this.logger.$params.q) { if (this.logger.$params.q) {
let tableValue = this.logger.$params.q; let tableValue = this.logger.$params.q;
const q = JSON.parse(tableValue); const q = JSON.parse(tableValue);
if (typeof q === 'number') if (typeof q === 'number')
tableValue = JSON.stringify({id: tableValue}); tableValue = JSON.stringify({id: tableValue});
newRoute = newRoute.concat(`?table=${tableValue}`); newRoute = newRoute.concat(`?table=${tableValue}`);
} } else if (!hasId && this.logger.$params.id && newRoute.indexOf(this.logger.$params.id) < 0)
if (this.logger.$params.id && newRoute.indexOf(this.logger.$params.id) < 0)
newRoute = newRoute.concat(`${this.logger.$params.id}`); newRoute = newRoute.concat(`${this.logger.$params.id}`);
return this.logger.$http.get('Urls/findOne', {filter}) return this.logger.$http.get('Urls/findOne', {filter})