Merge branch 'dev' into staging
This commit is contained in:
commit
5231dc03cf
@ -116,12 +116,19 @@ export default class OfficeRolesController extends ApiController {
|
||||
if (req.body.rules) {
|
||||
const allRules = await this.rulesService.get({
|
||||
where: {
|
||||
namespace: "notary",
|
||||
OR: [
|
||||
{
|
||||
namespace: "notary",
|
||||
},
|
||||
{
|
||||
namespace: "collaborator",
|
||||
},
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
req.body.rules = req.body.rules.filter((rule: any) => {
|
||||
const ruleFound = allRules.find((r) => r.uid === rule.uid && r.namespace === "notary");
|
||||
const ruleFound = allRules.find((r) => r.uid === rule.uid && (r.namespace === "notary" || r.namespace === "collaborator"));
|
||||
return ruleFound;
|
||||
});
|
||||
}
|
||||
|
@ -788,6 +788,13 @@ export default async function main() {
|
||||
updated_at: new Date(),
|
||||
namespace: "super-admin",
|
||||
},
|
||||
{
|
||||
name: "PUT rib",
|
||||
label: "Editer le RIB de l'office",
|
||||
created_at: new Date(),
|
||||
updated_at: new Date(),
|
||||
namespace: "notary",
|
||||
},
|
||||
];
|
||||
|
||||
const collaboratorRules = rules.filter((rule) => rule.namespace === "collaborator");
|
||||
|
Loading…
x
Reference in New Issue
Block a user