From befa6006447917b38cd02b9b8e2c8704faa8cd53 Mon Sep 17 00:00:00 2001 From: kriks7iitk Date: Fri, 12 Jul 2024 10:48:01 +0530 Subject: [PATCH] org constant fi --- .../permissions/utility/permission-ability.utility.ts | 6 +++++- server/src/services/permissions-ability.service.ts | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/src/modules/permissions/utility/permission-ability.utility.ts b/server/src/modules/permissions/utility/permission-ability.utility.ts index 8af83d1159..a15e941d2c 100644 --- a/server/src/modules/permissions/utility/permission-ability.utility.ts +++ b/server/src/modules/permissions/utility/permission-ability.utility.ts @@ -30,7 +30,11 @@ export function getUserPermissionsQuery( }, {}); query .leftJoin('groupPermissions.groupGranularPermissions', 'granularPermissions') - .andWhere(orConditions, parameters) + .andWhere( + new Brackets((qb) => { + qb.where(orConditions, parameters).orWhere('granularPermissions.id IS NULL'); + }) + ) .addSelect(['granularPermissions.isAll', 'granularPermissions.type']); } diff --git a/server/src/services/permissions-ability.service.ts b/server/src/services/permissions-ability.service.ts index 311a9ae33a..41b65a43f4 100644 --- a/server/src/services/permissions-ability.service.ts +++ b/server/src/services/permissions-ability.service.ts @@ -46,7 +46,7 @@ export class AbilityService { appCreate: acc.appCreate || group.appCreate, appDelete: acc.appDelete || group.appDelete, folderCRUD: acc.folderCRUD || group.folderCRUD, - orgConstantCRUD: acc.folderCRUD || group.folderCRUD, + orgConstantCRUD: acc.orgConstantCRUD || group.orgConstantCRUD, orgVariableCRUD: acc.orgVariableCRUD, }; }, DEFAULT_USER_PERMISSIONS);