verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 63 Releases Wiki Activity

refs #5753 db export and fix fixtures #1643

Merged
carlossa merged 6 commits from 5753_232401_db_dump into dev 2023-07-03 09:49:14 +00:00
Conversation 0 Commits 6 Files Changed 12 +11 -5
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6fcbf69f60 - Show all commits

6
db/changes/232801/00-fix_editCredit.sql
View File

@ -4,4 +4,10 @@ UPDATE `salix`.`ACL`
model = 'Client'
AND property = 'editCredit';
UPDATE `salix`.`ACL`
SET property='zeroCreditEditor'
WHERE
model = 'Client'
AND property = 'isNotEditableCredit';

10
modules/client/back/models/client.js
View File

@ -413,18 +413,18 @@ module.exports = Self => {
order: 'id DESC'
}, ctx.options);
alexm marked this conversation as resolved
alexm commented 2023-06-28 12:11:48 +00:00
Review
Copy Link

Lo que faig es mirar si el worker del ultim credit te isNotEditableCredit(FinancialBoss).
I mirar si el usuari te isNotEditableCredit.

Lo que faig es mirar si el worker del ultim credit te isNotEditableCredit(FinancialBoss). I mirar si el usuari te isNotEditableCredit.
if (lastCredit) {
const canEdit =
await models.ACL.checkAccessAcl(accessToken, 'Client', 'isNotEditableCredit', 'WRITE');
if (lastCredit && lastCredit.amount == 0) {
alexm marked this conversation as resolved Outdated
jgallego commented 2023-06-29 11:42:27 +00:00
Outdated
Review
Copy Link

lastCredit.amount == 0

lastCredit.amount == 0
const zeroCreditEditor =
alexm marked this conversation as resolved Outdated
jgallego commented 2023-06-29 11:49:05 +00:00
Outdated
Review
Copy Link

zeroCreditEditor

zeroCreditEditor
await models.ACL.checkAccessAcl(accessToken, 'Client', 'zeroCreditEditor', 'WRITE');
alexm marked this conversation as resolved Outdated
jgallego commented 2023-06-29 11:48:05 +00:00
Outdated
Review
Copy Link

zeroCreditEditor

zeroCreditEditor
const lastCreditIsNotEditable =
await models.ACL.checkAccessAcl(
{req: {accessToken: {userId: lastCredit.workerFk}}},
'Client',
'isNotEditableCredit',
'zeroCreditEditor',
'WRITE'
);
if (lastCredit.amount == 0 && lastCreditIsNotEditable && !canEdit)
if (lastCreditIsNotEditable && !zeroCreditEditor)
throw new UserError(`You can't change the credit set to zero from a financialBoss`);
}