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

refs #6023 Fix change rol bug
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Guillermo Bonet 2023-08-29 10:52:05 +02:00
parent 1ad9a30848
commit d1df8009a6
2 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
back/methods/vn-user/privileges.js
View File

@ -40,10 +40,17 @@ module.exports = Self => {
const userId = ctx.req.accessToken.userId;
const myOptions = {};
let tx;
if (typeof options == 'object')
Object.assign(myOptions, options);
if (!myOptions.transaction) {
tx = await Self.beginTransaction({});
myOptions.transaction = tx;
};
try {
const user = await Self.findById(userId, {fields: ['hasGrant']}, myOptions);
const userToUpdate = await Self.findById(id, {
@ -77,7 +84,12 @@ module.exports = Self => {
userToUpdate.roleFk = roleFk;
}
await userToUpdate.save(userToUpdate);
await models.Account.sync(userToUpdate.name);
await userToUpdate.save(myOptions);
await models.Account.sync(userToUpdate.name, null, null, myOptions);
await tx.commit();
} catch (err) {
await tx.rollback();
throw err;
};
};
};

5
modules/account/back/methods/account/sync.js
View File

@ -30,6 +30,11 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
if (!myOptions.transaction) {
tx = await Self.beginTransaction({});
myOptions.transaction = tx;
};
const models = Self.app.models;
const user = await models.VnUser.findOne({
fields: ['id'],