From 7312d53628b42add978e38faad7df17a31d93b35 Mon Sep 17 00:00:00 2001 From: Sebastian Franze Date: Thu, 2 Apr 2020 16:04:42 +0200 Subject: [PATCH 1/3] Don't check permissions if AdminApiSource is admin --- src/Core/Framework/Api/Acl/Resource/AclPermissionValidator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/Framework/Api/Acl/Resource/AclPermissionValidator.php b/src/Core/Framework/Api/Acl/Resource/AclPermissionValidator.php index 4df70103853..68fa16ee289 100644 --- a/src/Core/Framework/Api/Acl/Resource/AclPermissionValidator.php +++ b/src/Core/Framework/Api/Acl/Resource/AclPermissionValidator.php @@ -32,7 +32,7 @@ public function preValidate(PreWriteValidationEvent $event): void $commands = $event->getCommands(); $source = $event->getContext()->getSource(); - if (!$source instanceof AdminApiSource) { + if (!$source instanceof AdminApiSource || $source->isAdmin()) { return; } From 08c91d298f9ff143354e8b1edfe44a81646fbb1f Mon Sep 17 00:00:00 2001 From: Manuel Kress <6232639+windaishi@users.noreply.github.com> Date: Thu, 26 Mar 2020 11:35:08 +0100 Subject: [PATCH 2/3] NEXT-7966 - Add missing throw statement in Repository.delete --- .../app/administration/src/core/data-new/repository.data.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Administration/Resources/app/administration/src/core/data-new/repository.data.js b/src/Administration/Resources/app/administration/src/core/data-new/repository.data.js index 13a97b97199..ac99154f794 100644 --- a/src/Administration/Resources/app/administration/src/core/data-new/repository.data.js +++ b/src/Administration/Resources/app/administration/src/core/data-new/repository.data.js @@ -304,7 +304,9 @@ export default class Repository { return { error, id, entityName: this.entityName }; }); - return this.errorResolver.handleDeleteError(errors); + this.errorResolver.handleDeleteError(errors); + + throw errorResponse; }); } From c594cd6e69f0a1888ace006678f3e084ecb10528 Mon Sep 17 00:00:00 2001 From: Tobias Berge Date: Thu, 2 Apr 2020 16:32:31 +0200 Subject: [PATCH 3/3] NEXT-7966 - Update CHANGELOG-6.2.md --- CHANGELOG-6.2.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-6.2.md b/CHANGELOG-6.2.md index a90d09c9052..6e454452f0c 100644 --- a/CHANGELOG-6.2.md +++ b/CHANGELOG-6.2.md @@ -225,7 +225,8 @@ To get the diff between two versions, go to https://github.com/shopware/platform * sw-cms/elements/image/config/index.js * Method `onImageUpload` is now async * repository.data - * Added method `discard` + * Added method `discard` + * The `delete` method now throws an exception when the delete request is not successful * media.api.service * Added method `hasListeners` * Added method `hasDefaultListeners`