From fe657129a7226c26c17d189c60ececda7410c205 Mon Sep 17 00:00:00 2001 From: Vins Date: Tue, 20 Feb 2024 09:30:31 +0100 Subject: [PATCH] Fix Rules + rules PUT rib --- src/app/api/admin/OfficeRolesController.ts | 11 +++++++++-- src/common/databases/seeders/seeder.ts | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/app/api/admin/OfficeRolesController.ts b/src/app/api/admin/OfficeRolesController.ts index 5226a859..cb3162bd 100644 --- a/src/app/api/admin/OfficeRolesController.ts +++ b/src/app/api/admin/OfficeRolesController.ts @@ -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; }); } diff --git a/src/common/databases/seeders/seeder.ts b/src/common/databases/seeders/seeder.ts index c1feda5e..d8f1339c 100644 --- a/src/common/databases/seeders/seeder.ts +++ b/src/common/databases/seeders/seeder.ts @@ -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");