From 73dd4946be1c0dcac7edba90eda7204c191a76a9 Mon Sep 17 00:00:00 2001 From: Peter Wyss Date: Wed, 5 Jun 2024 15:56:37 +0200 Subject: [PATCH 1/3] BUGFIX: show FlashMessage if asset still in use Bugfix for #5085 no error if asset still in use and show flashmessage solution set class neos-notification-container as id --- Neos.Media.Browser/Resources/Private/Layouts/Default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Neos.Media.Browser/Resources/Private/Layouts/Default.html b/Neos.Media.Browser/Resources/Private/Layouts/Default.html index bad63b5e40c..32f509bc20d 100644 --- a/Neos.Media.Browser/Resources/Private/Layouts/Default.html +++ b/Neos.Media.Browser/Resources/Private/Layouts/Default.html @@ -23,7 +23,7 @@
-
+
From bc3eaf049f97004dc9d4d632a08b483f19953215 Mon Sep 17 00:00:00 2001 From: Peter Wyss Date: Fri, 21 Jun 2024 23:21:19 +0200 Subject: [PATCH 2/3] BUGFIX: FlashMessage always in default language Bugfix for #5085 load BackendUserTranslationTrait initializeObject with aliasing initializeObject, initializeObject was overridden by initializeObject from AssetController and and therefore not called. --- Neos.Media.Browser/Classes/Controller/AssetController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Neos.Media.Browser/Classes/Controller/AssetController.php b/Neos.Media.Browser/Classes/Controller/AssetController.php index e49dc7aef29..c8eff9148c2 100644 --- a/Neos.Media.Browser/Classes/Controller/AssetController.php +++ b/Neos.Media.Browser/Classes/Controller/AssetController.php @@ -70,8 +70,11 @@ */ class AssetController extends ActionController { - use CreateContentContextTrait; use BackendUserTranslationTrait; + use BackendUserTranslationTrait { + BackendUserTranslationTrait::initializeObject as BackendUserTranslationTraitInitializeObject; + } + use CreateContentContextTrait; use AddTranslatedFlashMessageTrait; protected const TAG_GIVEN = 0; @@ -170,6 +173,8 @@ class AssetController extends ActionController */ public function initializeObject(): void { + $this->backendUserTranslationTraitInitializeObject(); + $domain = $this->domainRepository->findOneByActiveRequest(); // Set active asset collection to the current site's asset collection, if it has one, on the first view if a matching domain is found From c3d70372e94ec7b5c9461bcaf0c5609f7abda91c Mon Sep 17 00:00:00 2001 From: Denny Lubitz Date: Fri, 16 Aug 2024 10:59:28 +0200 Subject: [PATCH 3/3] TASK: Align alias name and usage --- Neos.Media.Browser/Classes/Controller/AssetController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Neos.Media.Browser/Classes/Controller/AssetController.php b/Neos.Media.Browser/Classes/Controller/AssetController.php index c8eff9148c2..f4527c0aabc 100644 --- a/Neos.Media.Browser/Classes/Controller/AssetController.php +++ b/Neos.Media.Browser/Classes/Controller/AssetController.php @@ -72,7 +72,7 @@ class AssetController extends ActionController { use BackendUserTranslationTrait; use BackendUserTranslationTrait { - BackendUserTranslationTrait::initializeObject as BackendUserTranslationTraitInitializeObject; + BackendUserTranslationTrait::initializeObject as backendUserTranslationTraitInitializeObject; } use CreateContentContextTrait; use AddTranslatedFlashMessageTrait;