Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

org constant fi

Browse source
This commit is contained in:
kriks7iitk 2024-07-12 10:48:01 +05:30
parent 3ec8fb4fad
commit befa600644
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/src/modules/permissions/utility/permission-ability.utility.ts
View file

@ -30,7 +30,11 @@ export function getUserPermissionsQuery(
}, {}); }, {});
query query
.leftJoin('groupPermissions.groupGranularPermissions', 'granularPermissions') .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']); .addSelect(['granularPermissions.isAll', 'granularPermissions.type']);
} }

2
server/src/services/permissions-ability.service.ts
View file

@ -46,7 +46,7 @@ export class AbilityService {
appCreate: acc.appCreate || group.appCreate, appCreate: acc.appCreate || group.appCreate,
appDelete: acc.appDelete || group.appDelete, appDelete: acc.appDelete || group.appDelete,
folderCRUD: acc.folderCRUD || group.folderCRUD, folderCRUD: acc.folderCRUD || group.folderCRUD,
orgConstantCRUD: acc.folderCRUD || group.folderCRUD, orgConstantCRUD: acc.orgConstantCRUD || group.orgConstantCRUD,
orgVariableCRUD: acc.orgVariableCRUD, orgVariableCRUD: acc.orgVariableCRUD,
}; };
}, DEFAULT_USER_PERMISSIONS); }, DEFAULT_USER_PERMISSIONS);