From 14993d4d035a3397ae79c2edbf5043503b9f3a57 Mon Sep 17 00:00:00 2001 From: Sebastian Blank Date: Mon, 4 Mar 2024 08:56:23 +0100 Subject: [PATCH 1/3] Fix invite user modal translation (#450) --- src/Controller/Admin/UserController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/Admin/UserController.php b/src/Controller/Admin/UserController.php index 7a246e6ebc..2f0b5de13e 100644 --- a/src/Controller/Admin/UserController.php +++ b/src/Controller/Admin/UserController.php @@ -1210,7 +1210,7 @@ public function invitationLinkAction(Request $request, TranslatorInterface $tran $mail->send(); $success = true; - $message = sprintf($translator->trans('invitation_link_sent', [], 'admin'), $user->getEmail()); + $message = sprintf($translator->trans('invitation_link_sent', [], 'admin_ext'), $user->getEmail()); } catch (\Exception $e) { $message .= 'could not send email'; } From 42e49ee36cb57e066ec32454c79e048f6be347aa Mon Sep 17 00:00:00 2001 From: Sebastian Blank Date: Mon, 4 Mar 2024 08:57:45 +0100 Subject: [PATCH 2/3] Don (#449) --- public/js/pimcore/settings/thumbnail/item.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/js/pimcore/settings/thumbnail/item.js b/public/js/pimcore/settings/thumbnail/item.js index c5df022d39..34b2cd3352 100644 --- a/public/js/pimcore/settings/thumbnail/item.js +++ b/public/js/pimcore/settings/thumbnail/item.js @@ -671,6 +671,9 @@ pimcore.settings.thumbnail.items = { if (typeof data == "undefined") { data = {}; } + if (!data.positioning) { + data.positioning = 'center'; + } var myId = Ext.id(); var item = new Ext.form.FormPanel({ From 3a91315e74b2c118100d11e2eb24a788d31e6785 Mon Sep 17 00:00:00 2001 From: JiaJia Ji Date: Mon, 4 Mar 2024 15:12:00 +0100 Subject: [PATCH 3/3] [Bug]: Split view for localized fields in object bricks not working properly (data loss) (#451) * fix undefined language element * Update localizedfields.js --- .../js/pimcore/object/tags/localizedfields.js | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/public/js/pimcore/object/tags/localizedfields.js b/public/js/pimcore/object/tags/localizedfields.js index 8a030d446a..096b983f05 100644 --- a/public/js/pimcore/object/tags/localizedfields.js +++ b/public/js/pimcore/object/tags/localizedfields.js @@ -643,17 +643,19 @@ pimcore.object.tags.localizedfields = Class.create(pimcore.object.tags.abstract, for (var i = 0; i < this.frontendLanguages.length; i++) { var currentLanguage = this.frontendLanguages[i]; - for (var s = 0; s < this.languageElements[currentLanguage].length; s++) { - if (this.metaData[currentLanguage]) { - var languageElement = this.languageElements[currentLanguage][s]; - var key = languageElement.name; - if (this.metaData[currentLanguage][key]) { - if (this.metaData[currentLanguage][key].inherited) { - if (languageElement.isDirty()) { - this.metaData[currentLanguage][key].inherited = false; - languageElement.unmarkInherited(); - } else { - foundUnmodifiedInheritedField = true; + if (typeof this.languageElements[currentLanguage] !== "undefined") { + for (var s = 0; s < this.languageElements[currentLanguage].length; s++) { + if (this.metaData[currentLanguage]) { + var languageElement = this.languageElements[currentLanguage][s]; + var key = languageElement.name; + if (this.metaData[currentLanguage][key]) { + if (this.metaData[currentLanguage][key].inherited) { + if (languageElement.isDirty()) { + this.metaData[currentLanguage][key].inherited = false; + languageElement.unmarkInherited(); + } else { + foundUnmodifiedInheritedField = true; + } } } }