github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix empty current permissions (#10236)

Browse Source
This commit is contained in:
José Varela
2021-12-02 19:49:11 +00:00
committed by GitHub
parent b1af0a1cf7
commit 7966b4ea9d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/utils/merge-permissions.ts
View File

@@ -1,4 +1,4 @@
import { flatten, merge, omit } from 'lodash';
import { flatten, merge, omit, isEmpty } from 'lodash';
import { Permission, LogicalFilterOR } from '@directus/shared/types';
export function mergePermissions(...permissions: Permission[][]): Permission[] {
@@ -26,12 +26,12 @@ function mergePerm(currentPerm: Permission, newPerm: Permission) {
let fields = currentPerm.fields;
let presets = currentPerm.presets;
if (newPerm.permissions) {
if (newPerm.permissions && !isEmpty(newPerm.permissions)) {
if (currentPerm.permissions && Object.keys(currentPerm.permissions)[0] === '_or') {
permissions = {
_or: [...(currentPerm.permissions as LogicalFilterOR)._or, newPerm.permissions],
};
} else if (currentPerm.permissions) {
} else if (currentPerm.permissions && !isEmpty(currentPerm.permissions)) {
permissions = {
_or: [currentPerm.permissions, newPerm.permissions],
};