From e2f0088164ba484f691060eb361226c0b610691b Mon Sep 17 00:00:00 2001 From: Sebastian Blank Date: Fri, 1 Dec 2023 11:29:17 +0100 Subject: [PATCH] Allow (Inherited) Folder Restriction In Data Object/Document Tree --- .../Resources/public/js/backend/startup.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/MembersBundle/Resources/public/js/backend/startup.js b/src/MembersBundle/Resources/public/js/backend/startup.js index fba8e7b6..f3528399 100644 --- a/src/MembersBundle/Resources/public/js/backend/startup.js +++ b/src/MembersBundle/Resources/public/js/backend/startup.js @@ -114,11 +114,21 @@ class MembersCore { return false; } - if (type === 'object' && this.settings.restriction.allowed_objects.indexOf(obj.data.general.o_className) === -1) { + if ( + type === 'object' && + obj.data.general.o_type !== 'folder' && + this.settings.restriction.allowed_objects.indexOf(obj.data.general.o_className) === -1 + ) { isAllowed = false; - } else if (type === 'page' && ['page', 'link'].indexOf(obj.type) === -1) { + } else if ( + type === 'page' && + ['page', 'link', 'folder'].indexOf(obj.type) === -1 + ) { isAllowed = false; - } else if (type === 'asset' && !(obj.data.filename === 'restricted-assets' || obj.data.path.substring(0, 18) === '/restricted-assets')) { + } else if ( + type === 'asset' && + !(obj.data.filename === 'restricted-assets' || obj.data.path.substring(0, 18) === '/restricted-assets') + ) { isAllowed = false; }