From 8759484f7d4be17123d11ce680420fffe4b9631a Mon Sep 17 00:00:00 2001 From: Lukasz Ostafin Date: Thu, 28 May 2026 11:33:59 +0200 Subject: [PATCH 1/3] IBX-10442: Wrong labels for buttons when creating/editing user --- .../Resources/translations/ibexa_menu.en.xliff | 16 ++++++++-------- src/lib/Menu/UserCreateRightSidebarBuilder.php | 4 ++-- src/lib/Menu/UserEditRightSidebarBuilder.php | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/bundle/Resources/translations/ibexa_menu.en.xliff b/src/bundle/Resources/translations/ibexa_menu.en.xliff index 7a21ad38a2..922a3e2889 100644 --- a/src/bundle/Resources/translations/ibexa_menu.en.xliff +++ b/src/bundle/Resources/translations/ibexa_menu.en.xliff @@ -557,23 +557,23 @@ key: user__settings - Cancel - Cancel + Discard + Discard key: user_create__sidebar_right__cancel - Create - Create + Save and close + Save and close key: user_create__sidebar_right__create - Cancel - Cancel + Discard changes + Discard changes key: user_edit__sidebar_right__cancel - Update - Update + Save and close + Save and close key: user_edit__sidebar_right__update diff --git a/src/lib/Menu/UserCreateRightSidebarBuilder.php b/src/lib/Menu/UserCreateRightSidebarBuilder.php index f1ca3e4245..7656b9415a 100644 --- a/src/lib/Menu/UserCreateRightSidebarBuilder.php +++ b/src/lib/Menu/UserCreateRightSidebarBuilder.php @@ -77,8 +77,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Create'), - (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Cancel'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save and close'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard'), ]; } } diff --git a/src/lib/Menu/UserEditRightSidebarBuilder.php b/src/lib/Menu/UserEditRightSidebarBuilder.php index aa5586dd95..899415bb32 100644 --- a/src/lib/Menu/UserEditRightSidebarBuilder.php +++ b/src/lib/Menu/UserEditRightSidebarBuilder.php @@ -77,8 +77,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__UPDATE, 'ibexa_menu'))->setDesc('Update'), - (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Cancel'), + (new Message(self::ITEM__UPDATE, 'ibexa_menu'))->setDesc('Save and close'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } From 9fbbd5a19f5f9f10a974ce82eb6c5d7c0dd4edc9 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Mon, 1 Jun 2026 14:20:46 +0200 Subject: [PATCH 2/3] [Behat] updated gherkin steps --- features/standard/UserCreation.feature | 2 +- features/standard/UserProfile.feature | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/features/standard/UserCreation.feature b/features/standard/UserCreation.feature index 4bfe8d89d9..2006dc1922 100644 --- a/features/standard/UserCreation.feature +++ b/features/standard/UserCreation.feature @@ -18,7 +18,7 @@ Feature: User management And I set content fields for user | label | Username | Password | Confirm password | Email | Enabled | | User account | testuser | Test1234pw | Test1234pw | test@test.com | Yes | - And I perform the "Create" action + And I perform the "Save and close" action Then I should be on Content view Page for "Users/testuser lastname" And content attributes equal | label | value | diff --git a/features/standard/UserProfile.feature b/features/standard/UserProfile.feature index d9ef9f04d6..d76b1b1977 100644 --- a/features/standard/UserProfile.feature +++ b/features/standard/UserProfile.feature @@ -14,7 +14,7 @@ Feature: User profile management And I set content fields for user | label | Username | Password | Confirm password | Email | Enabled | | User account | testeditor | Test1234pw | Test1234pw | test@test.com | Yes | - And I perform the "Create" action + And I perform the "Save and close" action Then I should be on Content view Page for "/Users/Editors/EditorFirstName EditorLastName" And content attributes equal | label | value | From 46aef49af40c7a69ff2778b45fd736e89abb8cf0 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Mon, 1 Jun 2026 14:40:58 +0200 Subject: [PATCH 3/3] Covering missed steps --- features/standard/UserCreation.feature | 2 +- features/standard/UserProfile.feature | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/features/standard/UserCreation.feature b/features/standard/UserCreation.feature index 2006dc1922..7f0e523f09 100644 --- a/features/standard/UserCreation.feature +++ b/features/standard/UserCreation.feature @@ -39,7 +39,7 @@ Feature: User management And I set content fields for user | label | Username | Password | Confirm password | Email | | User account | testuser | Test123456 | Test123456 | test@test.org | - And I perform the "Update" action + And I perform the "Save and close" action Then I should be on Content view Page for "Users/testuseredited lastnameedited" And content attributes equal | label | value | diff --git a/features/standard/UserProfile.feature b/features/standard/UserProfile.feature index d76b1b1977..72abef8d74 100644 --- a/features/standard/UserProfile.feature +++ b/features/standard/UserProfile.feature @@ -43,7 +43,7 @@ Feature: User profile management | Job Title | TestJobTitle | | Department | TestDepartment | | Location | TestLocation | - And I perform the "Update" action + And I perform the "Save and close" action Then I should be on "User profile" page And I should see a user profile summary with values | Full name | Email | Job Title | Department | Location |