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

Merge dev - test #1881

Merged
jsegarra merged 71 commits from dev into test 2023-12-07 08:28:25 +00:00
Conversation 0 Commits 71 Files Changed 83 +27 -39
1 changed files with 27 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9f92bc4b4c - Show all commits

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

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