diff --git a/features/personas/ChangePassword.feature b/features/personas/ChangePassword.feature index be9d89a1a0..e64cb2a879 100644 --- a/features/personas/ChangePassword.feature +++ b/features/personas/ChangePassword.feature @@ -8,7 +8,7 @@ Feature: Verify that an User allowed to change password can change his password And I switch to "Account settings" tab in User settings And I click on the change password button And I change password from "Passw0rd-42" to "Passw0rd-43" - And I perform the "Save and close" action + And I perform the "Save" action Then success notification that "Your password has been successfully changed." appears And I should be on "User settings" page diff --git a/features/standard/Autosave.feature b/features/standard/Autosave.feature index a4c53fabe5..71d8db2e94 100644 --- a/features/standard/Autosave.feature +++ b/features/standard/Autosave.feature @@ -38,7 +38,7 @@ Feature: Content Items creation And I'm on Content view Page for root And I go to user settings And I disable autosave - And I perform the "Save and close" action + And I perform the "Save" action And I'm on Content view Page for root When I start creating a new content "Article" And I set content fields diff --git a/features/standard/ContentTypeGroup.feature b/features/standard/ContentTypeGroup.feature index 0e4d869c8a..572bbf0c5d 100644 --- a/features/standard/ContentTypeGroup.feature +++ b/features/standard/ContentTypeGroup.feature @@ -25,7 +25,7 @@ Feature: Content type groups management And I set fields | label | value | | Name | Test content type Group | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on content type group page for "Test content type Group" group And there're no content types for that group @@ -50,7 +50,7 @@ Feature: Content type groups management And I set fields | label | value | | Name | Test content type Group edited | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on content type group page for "Test content type Group edited" group And success notification that "Updated content type group 'Test content type Group'." appears diff --git a/features/standard/Languages.feature b/features/standard/Languages.feature index 0cc2ea4b3d..b1fb7862b1 100644 --- a/features/standard/Languages.feature +++ b/features/standard/Languages.feature @@ -26,7 +26,7 @@ Feature: Languages management | label | value | | Name | Deutsch | | Language code | de-DE | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Deutsch" Language page And Language has proper attributes | Name | Language code | Enabled | @@ -39,7 +39,7 @@ Feature: Languages management | label | value | | Name | Deutsch Second | | Language code | de-DE | - And I perform the "Save and close" action + And I perform the "Save" action Then error notification that 'language with the "de-DE" language code already exists' appears @javascript @@ -62,7 +62,7 @@ Feature: Languages management | label | value | | Name | Edited Deutsch | | Enabled | false | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Edited Deutsch" Language page And notification that "Language" "Deutsch" is updated appears And Language has proper attributes @@ -79,7 +79,7 @@ Feature: Languages management And I set fields | label | value | | Enabled | true | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Edited Deutsch" Language page And notification that "Language" "Edited Deutsch" is updated appears And Language has proper attributes diff --git a/features/standard/ObjectStates.feature b/features/standard/ObjectStates.feature index 83003a2dd2..2688e7d2ce 100644 --- a/features/standard/ObjectStates.feature +++ b/features/standard/ObjectStates.feature @@ -27,7 +27,7 @@ Feature: Object States management | label | value | | Name | Test Object State Group | | Identifier | TestObjectStateGroupIdentifier | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Test Object State Group" Object State group page And "Test Object State Group" Object State group has no Object States And Object State group has proper attributes @@ -57,7 +57,7 @@ Feature: Object States management And I set fields | label | value | | Name | Test Object State Group edited | - And I perform the "Save and close" action + And I perform the "Save" action Then notification that "Object state group" "Test Object State Group edited" is updated appears And I should be on "Test Object State Group edited" Object State group page @@ -80,7 +80,7 @@ Feature: Object States management And I set fields | label | value | | Name | Test Object State Group edited2 | - And I perform the "Save and close" action + And I perform the "Save" action Then notification that "Object state group" "Test Object State Group edited2" is updated appears And I should be on "Test Object State Group edited2" Object State group page @@ -104,7 +104,7 @@ Feature: Object States management | label | value | | Name | Test Object State | | Identifier | TestObjectStateIdentifier | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Test Object State" Object State page And Object State has proper attributes | label | value | @@ -131,7 +131,7 @@ Feature: Object States management And I set fields | label | value | | Name | Test Object State edited | - And I perform the "Save and close" action + And I perform the "Save" action Then notification that "Object state" "Test Object State edited" is updated appears And I should be on "Test Object State edited" Object State page And Object State has proper attributes @@ -158,7 +158,7 @@ Feature: Object States management And I set fields | label | value | | Name | Test Object State edited2 | - And I perform the "Save and close" action + And I perform the "Save" action Then notification that "Object state" "Test Object State edited2" is updated appears And I should be on "Test Object State edited2" Object State page And Object State has proper attributes @@ -174,7 +174,7 @@ Feature: Object States management | label | value | | Name | Test Object State 2 | | Identifier | TestObjectStateIdentifier2 | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Test Object State 2" Object State page And Object State has proper attributes | label | value | diff --git a/features/standard/Roles.feature b/features/standard/Roles.feature index 52e8358bdb..1bb4dc73c1 100644 --- a/features/standard/Roles.feature +++ b/features/standard/Roles.feature @@ -24,7 +24,7 @@ Feature: Roles management And I set fields | label | value | | Name | Test Role | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Test Role" Role page And Policies list is empty And Assignments list is empty @@ -51,7 +51,7 @@ Feature: Roles management And I set fields | label | value | | Name | Anonymous edited | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Anonymous edited" Role page @javascript @@ -85,7 +85,7 @@ Feature: Roles management | path | | Users/Editors | And I select limitation "Media/Images" for assignment through UDW - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Test Role" Role page And Policies list is empty And there are assignments on the "Test Role" assignments list @@ -102,7 +102,7 @@ Feature: Roles management And I assign groups to role | path | | Users | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Test Role" Role page And Policies list is empty And there are assignments on the "Test Role" assignments list @@ -146,12 +146,12 @@ Feature: Roles management And I open "Test Role" Role page in admin SiteAccess When I start creating a new Policy And I select policy "Content / Read" - And I perform the "Save and close" action + And I perform the "Save" action And success notification that "Now you can set Limitations for the Policy." appears And I select limitation for "Content type" | option | | File | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Test Role" Role page And there is a policy "Content/Read" with "Content type: File" limitation on the "Test Role" policies list And there are assignments on the "Test Role" assignments list @@ -164,7 +164,7 @@ Feature: Roles management And I open "Test Role" Role page in admin SiteAccess When I start creating a new Policy And I select policy "User / Password" - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Test Role" Role page And there is a policy "User/Password" with "None" limitation on the "Test Role" policies list And there are assignments on the "Test Role" assignments list @@ -184,7 +184,7 @@ Feature: Roles management And I select limitation for "State" | option | | Lock:Locked | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Test Role" Role page And there are policies on the "Test Role" policies list | policy | limitation | diff --git a/features/standard/Sections.feature b/features/standard/Sections.feature index 88ef721b63..96dc125f37 100644 --- a/features/standard/Sections.feature +++ b/features/standard/Sections.feature @@ -27,7 +27,7 @@ Feature: Sections management | label | value | | Name | Test Section | | Identifier | TestSectionIdentifier | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Test Section" Section page And Content items list in is empty for Section And Section has proper attributes @@ -84,7 +84,7 @@ Feature: Sections management And I set fields | label | value | | Name | Test Section edited | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Test Section edited" Section page And notification that "Section" "Test Section edited" is updated appears @@ -107,7 +107,7 @@ Feature: Sections management And I set fields | label | value | | Name | Test Section edited2 | - And I perform the "Save and close" action + And I perform the "Save" action Then I should be on "Test Section edited2" Section page And notification that "Section" "Test Section edited2" is updated appears @@ -125,7 +125,7 @@ Feature: Sections management | label | value | | Name | TestSectionAssign | | Identifier | TestSectionAssignIdentifier | - And I perform the "Save and close" action + And I perform the "Save" action And I open "TestSectionAssign" Section page in admin SiteAccess When I start assigning to "TestSectionAssign" Section And I select content "Media/TestSection" through UDW @@ -154,7 +154,7 @@ Feature: Sections management | label | value | | Name | Test Section | | Identifier | TestSectionIdentifier2 | - And I perform the "Save and close" action + And I perform the "Save" action And notification that "Section" "Test Section" is created appears When I delete the section Then notification that "Section" "Test Section" is removed appears diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 0cded9dcf5..c66296d070 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -345,7 +345,7 @@ parameters: - message: '#^Cannot access property \$id on Ibexa\\Contracts\\Core\\Repository\\Values\\ContentType\\ContentTypeGroup\|null\.$#' identifier: property.nonObject - count: 2 + count: 1 path: src/bundle/Controller/ContentTypeGroupController.php - @@ -531,7 +531,7 @@ parameters: - message: '#^Access to protected property Ibexa\\Contracts\\Core\\Repository\\Values\\URL\\URL\:\:\$id\.$#' identifier: property.protected - count: 2 + count: 1 path: src/bundle/Controller/LinkManagerController.php - @@ -693,7 +693,7 @@ parameters: - message: '#^Cannot access property \$id on Ibexa\\Contracts\\Core\\Repository\\Values\\ObjectState\\ObjectState\|null\.$#' identifier: property.nonObject - count: 2 + count: 1 path: src/bundle/Controller/ObjectStateController.php - @@ -801,7 +801,7 @@ parameters: - message: '#^Cannot access property \$id on Ibexa\\Contracts\\Core\\Repository\\Values\\ObjectState\\ObjectStateGroup\|null\.$#' identifier: property.nonObject - count: 2 + count: 1 path: src/bundle/Controller/ObjectStateGroupController.php - @@ -3264,18 +3264,6 @@ parameters: count: 1 path: src/lib/EventListener/SetViewParametersListener.php - - - message: '#^Method Ibexa\\AdminUi\\EventListener\\UserPasswordChangeRightSidebarListener\:\:getSubscribedEvents\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: src/lib/EventListener/UserPasswordChangeRightSidebarListener.php - - - - message: '#^Property Ibexa\\AdminUi\\EventListener\\UserPasswordChangeRightSidebarListener\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/EventListener/UserPasswordChangeRightSidebarListener.php - - message: '#^Method Ibexa\\AdminUi\\Exception\\ContentTypeIconNotFoundException\:\:__construct\(\) has parameter \$code with no type specified\.$#' identifier: missingType.parameter @@ -6978,48 +6966,24 @@ parameters: count: 1 path: src/lib/Menu/Admin/ContentType/ContentTypeGroupCreateRightSidebarBuilder.php - - - message: '#^Property Ibexa\\AdminUi\\Menu\\Admin\\ContentType\\ContentTypeGroupCreateRightSidebarBuilder\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/Menu/Admin/ContentType/ContentTypeGroupCreateRightSidebarBuilder.php - - message: '#^Method Ibexa\\AdminUi\\Menu\\Admin\\ContentType\\ContentTypeGroupEditRightSidebarBuilder\:\:createStructure\(\) has parameter \$options with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: src/lib/Menu/Admin/ContentType/ContentTypeGroupEditRightSidebarBuilder.php - - - message: '#^Property Ibexa\\AdminUi\\Menu\\Admin\\ContentType\\ContentTypeGroupEditRightSidebarBuilder\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/Menu/Admin/ContentType/ContentTypeGroupEditRightSidebarBuilder.php - - message: '#^Method Ibexa\\AdminUi\\Menu\\Admin\\Language\\LanguageCreateRightSidebarBuilder\:\:createStructure\(\) has parameter \$options with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: src/lib/Menu/Admin/Language/LanguageCreateRightSidebarBuilder.php - - - message: '#^Property Ibexa\\AdminUi\\Menu\\Admin\\Language\\LanguageCreateRightSidebarBuilder\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/Menu/Admin/Language/LanguageCreateRightSidebarBuilder.php - - message: '#^Method Ibexa\\AdminUi\\Menu\\Admin\\Language\\LanguageEditRightSidebarBuilder\:\:createStructure\(\) has parameter \$options with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: src/lib/Menu/Admin/Language/LanguageEditRightSidebarBuilder.php - - - message: '#^Property Ibexa\\AdminUi\\Menu\\Admin\\Language\\LanguageEditRightSidebarBuilder\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/Menu/Admin/Language/LanguageEditRightSidebarBuilder.php - - message: '#^Method Ibexa\\AdminUi\\Menu\\Admin\\ObjectState\\ObjectStateCreateRightSidebarBuilder\:\:createStructure\(\) has parameter \$options with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -7038,24 +7002,12 @@ parameters: count: 1 path: src/lib/Menu/Admin/ObjectState/ObjectStateGroupCreateRightSidebarBuilder.php - - - message: '#^Property Ibexa\\AdminUi\\Menu\\Admin\\ObjectState\\ObjectStateGroupCreateRightSidebarBuilder\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/Menu/Admin/ObjectState/ObjectStateGroupCreateRightSidebarBuilder.php - - message: '#^Method Ibexa\\AdminUi\\Menu\\Admin\\ObjectState\\ObjectStateGroupEditRightSidebarBuilder\:\:createStructure\(\) has parameter \$options with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: src/lib/Menu/Admin/ObjectState/ObjectStateGroupEditRightSidebarBuilder.php - - - message: '#^Property Ibexa\\AdminUi\\Menu\\Admin\\ObjectState\\ObjectStateGroupEditRightSidebarBuilder\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/Menu/Admin/ObjectState/ObjectStateGroupEditRightSidebarBuilder.php - - message: '#^Parameter \#1 \$item of method Knp\\Menu\\Util\\MenuManipulator\:\:moveToLastPosition\(\) expects Knp\\Menu\\ItemInterface, Knp\\Menu\\ItemInterface\|null given\.$#' identifier: argument.type @@ -7104,24 +7056,12 @@ parameters: count: 1 path: src/lib/Menu/Admin/Role/RoleCreateRightSidebarBuilder.php - - - message: '#^Property Ibexa\\AdminUi\\Menu\\Admin\\Role\\RoleCreateRightSidebarBuilder\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/Menu/Admin/Role/RoleCreateRightSidebarBuilder.php - - message: '#^Method Ibexa\\AdminUi\\Menu\\Admin\\Role\\RoleEditRightSidebarBuilder\:\:createStructure\(\) has parameter \$options with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: src/lib/Menu/Admin/Role/RoleEditRightSidebarBuilder.php - - - message: '#^Property Ibexa\\AdminUi\\Menu\\Admin\\Role\\RoleEditRightSidebarBuilder\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/Menu/Admin/Role/RoleEditRightSidebarBuilder.php - - message: '#^Access to an undefined property Ibexa\\AdminUi\\Menu\\ContentCreateRightSidebarBuilder\:\:\$translator\.$#' identifier: property.notFound @@ -7224,24 +7164,12 @@ parameters: count: 1 path: src/lib/Menu/SectionCreateRightSidebarBuilder.php - - - message: '#^Property Ibexa\\AdminUi\\Menu\\SectionCreateRightSidebarBuilder\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/Menu/SectionCreateRightSidebarBuilder.php - - message: '#^Method Ibexa\\AdminUi\\Menu\\SectionEditRightSidebarBuilder\:\:createStructure\(\) has parameter \$options with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: src/lib/Menu/SectionEditRightSidebarBuilder.php - - - message: '#^Property Ibexa\\AdminUi\\Menu\\SectionEditRightSidebarBuilder\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/Menu/SectionEditRightSidebarBuilder.php - - message: '#^Method Ibexa\\AdminUi\\Menu\\TrashRightSidebarBuilder\:\:createStructure\(\) has parameter \$options with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -7272,24 +7200,12 @@ parameters: count: 1 path: src/lib/Menu/URLEditRightSidebarBuilder.php - - - message: '#^Property Ibexa\\AdminUi\\Menu\\URLEditRightSidebarBuilder\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/Menu/URLEditRightSidebarBuilder.php - - message: '#^Method Ibexa\\AdminUi\\Menu\\URLWildcardEditRightSidebarBuilder\:\:createStructure\(\) has parameter \$options with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: src/lib/Menu/URLWildcardEditRightSidebarBuilder.php - - - message: '#^Property Ibexa\\AdminUi\\Menu\\URLWildcardEditRightSidebarBuilder\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/Menu/URLWildcardEditRightSidebarBuilder.php - - message: '#^Method Ibexa\\AdminUi\\Menu\\UserCreateRightSidebarBuilder\:\:createStructure\(\) has parameter \$options with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -7314,24 +7230,12 @@ parameters: count: 1 path: src/lib/Menu/UserPasswordChangeRightSidebarBuilder.php - - - message: '#^Property Ibexa\\AdminUi\\Menu\\UserPasswordChangeRightSidebarBuilder\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/Menu/UserPasswordChangeRightSidebarBuilder.php - - message: '#^Method Ibexa\\AdminUi\\Menu\\UserSetting\\UserSettingUpdateRightSidebarBuilder\:\:createStructure\(\) has parameter \$options with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: src/lib/Menu/UserSetting/UserSettingUpdateRightSidebarBuilder.php - - - message: '#^Property Ibexa\\AdminUi\\Menu\\UserSetting\\UserSettingUpdateRightSidebarBuilder\:\:\$translator is never read, only written\.$#' - identifier: property.onlyWritten - count: 1 - path: src/lib/Menu/UserSetting/UserSettingUpdateRightSidebarBuilder.php - - message: '#^Call to an undefined method Symfony\\Component\\HttpFoundation\\Session\\SessionInterface\:\:getFlashBag\(\)\.$#' identifier: method.notFound diff --git a/src/bundle/Controller/ContentTypeGroupController.php b/src/bundle/Controller/ContentTypeGroupController.php index 1919908f6f..389b6471b1 100644 --- a/src/bundle/Controller/ContentTypeGroupController.php +++ b/src/bundle/Controller/ContentTypeGroupController.php @@ -14,7 +14,6 @@ use Ibexa\AdminUi\Form\Data\ContentTypeGroup\ContentTypeGroupUpdateData; use Ibexa\AdminUi\Form\Factory\FormFactory; use Ibexa\AdminUi\Form\SubmitHandler; -use Ibexa\AdminUi\Form\Type\ContentTypeGroup\ContentTypeGroupCreateType; use Ibexa\Contracts\AdminUi\Controller\Controller; use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; use Ibexa\Contracts\Core\Repository\ContentTypeService; @@ -24,7 +23,6 @@ use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; -use Symfony\Component\Form\Button; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -108,7 +106,7 @@ public function createAction(Request $request): Response $form->handleRequest($request); if ($form->isSubmitted()) { - $result = $this->submitHandler->handle($form, function (ContentTypeGroupCreateData $data) use ($form): Response { + $result = $this->submitHandler->handle($form, function (ContentTypeGroupCreateData $data): Response { $createStruct = $this->contentTypeService->newContentTypeGroupCreateStruct( $data->getIdentifier() ); @@ -121,14 +119,6 @@ public function createAction(Request $request): Response 'ibexa_content_type' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === ContentTypeGroupCreateType::BTN_SAVE - ) { - return $this->redirectToRoute('ibexa.content_type_group.update', [ - 'contentTypeGroupId' => $group->id, - ]); - } - return new RedirectResponse($this->generateUrl('ibexa.content_type_group.view', [ 'contentTypeGroupId' => $group->id, ])); @@ -155,7 +145,7 @@ public function updateAction(Request $request, ContentTypeGroup $group): Respons $form->handleRequest($request); if ($form->isSubmitted()) { - $result = $this->submitHandler->handle($form, function (ContentTypeGroupUpdateData $data) use ($form): Response { + $result = $this->submitHandler->handle($form, function (ContentTypeGroupUpdateData $data): Response { $group = $data->getContentTypeGroup(); $updateStruct = $this->contentTypeService->newContentTypeGroupUpdateStruct(); $updateStruct->identifier = $data->getIdentifier(); @@ -169,14 +159,6 @@ public function updateAction(Request $request, ContentTypeGroup $group): Respons 'ibexa_content_type' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === ContentTypeGroupCreateType::BTN_SAVE - ) { - return $this->redirectToRoute('ibexa.content_type_group.update', [ - 'contentTypeGroupId' => $group->id, - ]); - } - return new RedirectResponse($this->generateUrl('ibexa.content_type_group.view', [ 'contentTypeGroupId' => $group->id, ])); diff --git a/src/bundle/Controller/LanguageController.php b/src/bundle/Controller/LanguageController.php index 9f26101f65..1b2d2a0c37 100644 --- a/src/bundle/Controller/LanguageController.php +++ b/src/bundle/Controller/LanguageController.php @@ -14,8 +14,6 @@ use Ibexa\AdminUi\Form\DataMapper\LanguageCreateMapper; use Ibexa\AdminUi\Form\Factory\FormFactory; use Ibexa\AdminUi\Form\SubmitHandler; -use Ibexa\AdminUi\Form\Type\Language\LanguageCreateType; -use Ibexa\AdminUi\Form\Type\Language\LanguageUpdateType; use Ibexa\Contracts\AdminUi\Controller\Controller; use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; use Ibexa\Contracts\Core\Repository\LanguageService; @@ -25,7 +23,6 @@ use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; -use Symfony\Component\Form\Button; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -201,7 +198,7 @@ public function createAction(Request $request): Response $form->handleRequest($request); if ($form->isSubmitted()) { - $result = $this->submitHandler->handle($form, function (LanguageCreateData $data) use ($form): Response { + $result = $this->submitHandler->handle($form, function (LanguageCreateData $data): Response { $languageCreateStruct = $this->languageCreateMapper->reverseMap($data); $language = $this->languageService->createLanguage($languageCreateStruct); @@ -212,14 +209,6 @@ public function createAction(Request $request): Response 'ibexa_language' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === LanguageCreateType::BTN_SAVE - ) { - return $this->redirectToRoute('ibexa.language.edit', [ - 'languageId' => $language->id, - ]); - } - return new RedirectResponse($this->generateUrl('ibexa.language.view', [ 'languageId' => $language->id, ])); @@ -245,7 +234,7 @@ public function editAction(Request $request, Language $language): Response $form->handleRequest($request); if ($form->isSubmitted()) { - $result = $this->submitHandler->handle($form, function (LanguageUpdateData $data) use ($language, $form): Response { + $result = $this->submitHandler->handle($form, function (LanguageUpdateData $data) use ($language): Response { $this->languageService->updateLanguageName($language, $data->getName()); $data->isEnabled() @@ -259,14 +248,6 @@ public function editAction(Request $request, Language $language): Response 'ibexa_language' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === LanguageUpdateType::BTN_SAVE - ) { - return $this->redirectToRoute('ibexa.language.edit', [ - 'languageId' => $language->id, - ]); - } - return new RedirectResponse($this->generateUrl('ibexa.language.view', [ 'languageId' => $language->id, ])); diff --git a/src/bundle/Controller/LinkManagerController.php b/src/bundle/Controller/LinkManagerController.php index e17407ea93..1bd0dc4af8 100644 --- a/src/bundle/Controller/LinkManagerController.php +++ b/src/bundle/Controller/LinkManagerController.php @@ -11,7 +11,6 @@ use Ibexa\AdminUi\Form\Data\URL\URLUpdateData; use Ibexa\AdminUi\Form\Factory\FormFactory; use Ibexa\AdminUi\Form\SubmitHandler; -use Ibexa\AdminUi\Form\Type\URL\URLEditType; use Ibexa\AdminUi\Pagination\Pagerfanta\URLUsagesAdapter; use Ibexa\Contracts\AdminUi\Controller\Controller; use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; @@ -19,7 +18,6 @@ use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Pagerfanta; -use Symfony\Component\Form\Button; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -52,7 +50,7 @@ public function editAction(Request $request, int $urlId): Response $form->handleRequest($request); if ($form->isSubmitted()) { - $result = $this->submitHandler->handle($form, function (URLUpdateData $data) use ($url, $form): Response { + $result = $this->submitHandler->handle($form, function (URLUpdateData $data) use ($url): Response { $this->urlService->updateUrl($url, $data); $this->notificationHandler->success( /** @Desc("URL updated") */ @@ -61,14 +59,6 @@ public function editAction(Request $request, int $urlId): Response 'ibexa_linkmanager' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === URLEditType::BTN_SAVE - ) { - return $this->redirectToRoute('ibexa.link_manager.edit', [ - 'urlId' => $url->id, - ]); - } - return $this->redirectToRoute('ibexa.url_management'); }); diff --git a/src/bundle/Controller/ObjectStateController.php b/src/bundle/Controller/ObjectStateController.php index a7f9663772..8e015ef71a 100644 --- a/src/bundle/Controller/ObjectStateController.php +++ b/src/bundle/Controller/ObjectStateController.php @@ -29,7 +29,6 @@ use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use JMS\TranslationBundle\Annotation\Desc; -use Symfony\Component\Form\Button; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -136,7 +135,7 @@ public function addAction(Request $request, ObjectStateGroup $objectStateGroup): if ($form->isSubmitted()) { $result = $this->submitHandler->handle( $form, - function (ObjectStateCreateData $data) use ($defaultLanguageCode, $objectStateGroup, $form): Response { + function (ObjectStateCreateData $data) use ($defaultLanguageCode, $objectStateGroup): Response { $createStruct = $this->objectStateService->newObjectStateCreateStruct( $data->getIdentifier() ); @@ -151,14 +150,6 @@ function (ObjectStateCreateData $data) use ($defaultLanguageCode, $objectStateGr 'ibexa_object_state' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === ObjectStateCreateType::BTN_CREATE_AND_EDIT - ) { - return $this->redirectToRoute('ibexa.object_state.state.update', [ - 'objectStateId' => $objectState->id, - ]); - } - return $this->redirectToRoute('ibexa.object_state.state.view', [ 'objectStateId' => $objectState->id, ]); @@ -272,7 +263,7 @@ public function updateAction(Request $request, ObjectState $objectState): Respon $form->handleRequest($request); if ($form->isSubmitted()) { - $result = $this->submitHandler->handle($form, function (ObjectStateUpdateData $data) use ($form): Response { + $result = $this->submitHandler->handle($form, function (ObjectStateUpdateData $data): Response { $objectState = $data->getObjectState(); $updateStruct = $this->objectStateService->newObjectStateUpdateStruct(); $updateStruct->identifier = $data->getIdentifier(); @@ -287,14 +278,6 @@ public function updateAction(Request $request, ObjectState $objectState): Respon 'ibexa_object_state' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === ObjectStateUpdateType::BTN_SAVE - ) { - return $this->redirectToRoute('ibexa.object_state.state.update', [ - 'objectStateId' => $objectState->id, - ]); - } - return $this->redirectToRoute('ibexa.object_state.state.view', [ 'objectStateId' => $objectState->id, ]); diff --git a/src/bundle/Controller/ObjectStateGroupController.php b/src/bundle/Controller/ObjectStateGroupController.php index 6754ffd0cd..c1d59545b9 100644 --- a/src/bundle/Controller/ObjectStateGroupController.php +++ b/src/bundle/Controller/ObjectStateGroupController.php @@ -14,8 +14,6 @@ use Ibexa\AdminUi\Form\Data\ObjectState\ObjectStateGroupUpdateData; use Ibexa\AdminUi\Form\Factory\FormFactory; use Ibexa\AdminUi\Form\SubmitHandler; -use Ibexa\AdminUi\Form\Type\ObjectState\ObjectStateGroupCreateType; -use Ibexa\AdminUi\Form\Type\ObjectState\ObjectStateUpdateType; use Ibexa\Contracts\AdminUi\Controller\Controller; use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; use Ibexa\Contracts\Core\Repository\ObjectStateService; @@ -23,7 +21,6 @@ use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use JMS\TranslationBundle\Annotation\Desc; -use Symfony\Component\Form\Button; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -116,7 +113,7 @@ public function addAction(Request $request): Response if ($form->isSubmitted()) { $result = $this->submitHandler->handle( $form, - function (ObjectStateGroupCreateData $data) use ($defaultLanguageCode, $form): Response { + function (ObjectStateGroupCreateData $data) use ($defaultLanguageCode): Response { $createStruct = $this->objectStateService->newObjectStateGroupCreateStruct( $data->getIdentifier() ); @@ -131,14 +128,6 @@ function (ObjectStateGroupCreateData $data) use ($defaultLanguageCode, $form): R 'ibexa_object_state' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === ObjectStateGroupCreateType::BTN_CREATE_AND_EDIT - ) { - return $this->redirectToRoute('ibexa.object_state.group.update', [ - 'objectStateGroupId' => $group->id, - ]); - } - return $this->redirectToRoute('ibexa.object_state.group.view', [ 'objectStateGroupId' => $group->id, ]); @@ -245,7 +234,7 @@ public function updateAction(Request $request, ObjectStateGroup $group): Respons $form->handleRequest($request); if ($form->isSubmitted()) { - $result = $this->submitHandler->handle($form, function (ObjectStateGroupUpdateData $data) use ($form): Response { + $result = $this->submitHandler->handle($form, function (ObjectStateGroupUpdateData $data): Response { $group = $data->getObjectStateGroup(); $updateStruct = $this->objectStateService->newObjectStateGroupUpdateStruct(); $updateStruct->identifier = $data->getIdentifier(); @@ -260,14 +249,6 @@ public function updateAction(Request $request, ObjectStateGroup $group): Respons 'ibexa_object_state' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === ObjectStateUpdateType::BTN_SAVE - ) { - return $this->redirectToRoute('ibexa.object_state.group.update', [ - 'objectStateGroupId' => $group->id, - ]); - } - return $this->redirectToRoute('ibexa.object_state.group.view', [ 'objectStateGroupId' => $group->id, ]); diff --git a/src/bundle/Controller/PolicyController.php b/src/bundle/Controller/PolicyController.php index ba02dd53d9..a91692ea82 100644 --- a/src/bundle/Controller/PolicyController.php +++ b/src/bundle/Controller/PolicyController.php @@ -16,7 +16,6 @@ use Ibexa\AdminUi\Form\DataMapper\PolicyUpdateMapper; use Ibexa\AdminUi\Form\Factory\FormFactory; use Ibexa\AdminUi\Form\SubmitHandler; -use Ibexa\AdminUi\Form\Type\Policy\PolicyUpdateType; use Ibexa\Contracts\AdminUi\Controller\Controller; use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; @@ -28,7 +27,6 @@ use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; -use Symfony\Component\Form\Button; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -229,7 +227,7 @@ public function updateAction(Request $request, Role $role, Policy $policy): Resp $form->handleRequest($request); if ($form->isSubmitted()) { - $result = $this->submitHandler->handle($form, function (PolicyUpdateData $data) use ($role, $policy, $form): Response { + $result = $this->submitHandler->handle($form, function (PolicyUpdateData $data) use ($role, $policy): Response { $policyUpdateStruct = $this->policyUpdateMapper->reverseMap($data); $roleDraft = $this->roleService->createRoleDraft($role); @@ -249,15 +247,6 @@ public function updateAction(Request $request, Role $role, Policy $policy): Resp 'ibexa_role' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === PolicyUpdateType::BTN_SAVE - ) { - return $this->redirectToRoute('ibexa.policy.update', [ - 'roleId' => $roleDraft->id, - 'policyId' => $policy->id, - ]); - } - return new RedirectResponse($this->generateUrl('ibexa.role.view', [ 'roleId' => $role->id, ])); diff --git a/src/bundle/Controller/RoleController.php b/src/bundle/Controller/RoleController.php index edc1f5dd64..8fe3623aa3 100644 --- a/src/bundle/Controller/RoleController.php +++ b/src/bundle/Controller/RoleController.php @@ -19,8 +19,6 @@ use Ibexa\AdminUi\Form\Factory\FormFactory; use Ibexa\AdminUi\Form\SubmitHandler; use Ibexa\AdminUi\Form\Type\Role\RoleCopyType; -use Ibexa\AdminUi\Form\Type\Role\RoleCreateType; -use Ibexa\AdminUi\Form\Type\Role\RoleUpdateType; use Ibexa\Contracts\AdminUi\Controller\Controller; use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; use Ibexa\Contracts\Core\Repository\RoleService; @@ -30,7 +28,6 @@ use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; -use Symfony\Component\Form\Button; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -133,7 +130,7 @@ public function createAction(Request $request): Response $form->handleRequest($request); if ($form->isSubmitted()) { - $result = $this->submitHandler->handle($form, function (RoleCreateData $data) use ($form): Response { + $result = $this->submitHandler->handle($form, function (RoleCreateData $data): Response { $roleCreateStruct = $this->roleCreateMapper->reverseMap($data); $roleDraft = $this->roleService->createRole($roleCreateStruct); $this->roleService->publishRoleDraft($roleDraft); @@ -145,14 +142,6 @@ public function createAction(Request $request): Response 'ibexa_role' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === RoleCreateType::BTN_SAVE - ) { - return $this->redirectToRoute('ibexa.role.update', [ - 'roleId' => $roleDraft->id, - ]); - } - return new RedirectResponse($this->generateUrl('ibexa.role.view', [ 'roleId' => $roleDraft->id, ])); @@ -219,7 +208,7 @@ public function updateAction(Request $request, Role $role): Response $form->handleRequest($request); if ($form->isSubmitted()) { - $result = $this->submitHandler->handle($form, function (RoleUpdateData $data) use ($form): Response { + $result = $this->submitHandler->handle($form, function (RoleUpdateData $data): Response { /** @var \Ibexa\Contracts\Core\Repository\Values\User\Role $role */ $role = $data->getRole(); @@ -236,14 +225,6 @@ public function updateAction(Request $request, Role $role): Response 'ibexa_role' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === RoleUpdateType::BTN_SAVE - ) { - return $this->redirectToRoute('ibexa.role.update', [ - 'roleId' => $role->id, - ]); - } - return new RedirectResponse($this->generateUrl('ibexa.role.view', [ 'roleId' => $role->id, ])); diff --git a/src/bundle/Controller/SectionController.php b/src/bundle/Controller/SectionController.php index 317adb025a..016878ae2e 100644 --- a/src/bundle/Controller/SectionController.php +++ b/src/bundle/Controller/SectionController.php @@ -18,8 +18,6 @@ use Ibexa\AdminUi\Form\DataMapper\SectionUpdateMapper; use Ibexa\AdminUi\Form\Factory\FormFactory; use Ibexa\AdminUi\Form\SubmitHandler; -use Ibexa\AdminUi\Form\Type\Section\SectionCreateType; -use Ibexa\AdminUi\Form\Type\Section\SectionUpdateType; use Ibexa\AdminUi\UI\Service\PathService; use Ibexa\Bundle\AdminUi\View\IbexaPagerfantaView; use Ibexa\Bundle\AdminUi\View\Template\IbexaPagerfantaTemplate; @@ -40,7 +38,6 @@ use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; -use Symfony\Component\Form\Button; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -401,14 +398,6 @@ public function createAction(Request $request): Response 'ibexa_section' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === SectionCreateType::BTN_CREATE_AND_EDIT - ) { - return $this->redirectToRoute('ibexa.section.update', [ - 'sectionId' => $section->id, - ]); - } - return new RedirectResponse($this->generateUrl('ibexa.section.view', [ 'sectionId' => $section->id, ])); @@ -452,13 +441,9 @@ public function updateAction(Request $request, Section $section): Response 'ibexa_section' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === SectionUpdateType::BTN_UPDATE - ) { - return new RedirectResponse($this->generateUrl('ibexa.section.view', [ - 'sectionId' => $section->id, - ])); - } + return new RedirectResponse($this->generateUrl('ibexa.section.view', [ + 'sectionId' => $section->id, + ])); } catch (Exception $e) { $this->notificationHandler->error(/** @Ignore */ $e->getMessage() diff --git a/src/bundle/Controller/URLWildcardController.php b/src/bundle/Controller/URLWildcardController.php index a5e04c3154..fbb6d86d23 100644 --- a/src/bundle/Controller/URLWildcardController.php +++ b/src/bundle/Controller/URLWildcardController.php @@ -13,7 +13,6 @@ use Ibexa\AdminUi\Form\Data\URLWildcard\URLWildcardUpdateData; use Ibexa\AdminUi\Form\Factory\FormFactory; use Ibexa\AdminUi\Form\SubmitHandler; -use Ibexa\AdminUi\Form\Type\URLWildcard\URLWildcardUpdateType; use Ibexa\AdminUi\Tab\URLManagement\URLWildcardsTab; use Ibexa\Contracts\AdminUi\Controller\Controller; use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; @@ -21,7 +20,6 @@ use Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard; use Ibexa\Contracts\Core\Repository\Values\Content\URLWildcardUpdateStruct; use JMS\TranslationBundle\Annotation\Desc; -use Symfony\Component\Form\Button; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -60,8 +58,8 @@ public function addAction(Request $request): Response $form->handleRequest($request); if ($form->isSubmitted()) { - $this->submitHandler->handle($form, function (URLWildcardData $data) use ($form): Response { - $urlWildcard = $this->urlWildcardService->create( + $this->submitHandler->handle($form, function (URLWildcardData $data): Response { + $this->urlWildcardService->create( $data->getSourceURL(), $data->getDestinationUrl(), (bool) $data->getForward() @@ -74,14 +72,6 @@ public function addAction(Request $request): Response 'ibexa_url_wildcard' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === URLWildcardUpdateType::BTN_SAVE - ) { - return $this->redirectToRoute('ibexa.url_wildcard.update', [ - 'urlWildcardId' => $urlWildcard->id, - ]); - } - return $this->redirectToRoute('ibexa.url_management', [ '_fragment' => URLWildcardsTab::URI_FRAGMENT, ]); @@ -111,7 +101,7 @@ public function updateAction(URLWildcard $urlWildcard, Request $request): Respon if ($form->isSubmitted()) { $result = $this->submitHandler->handle( $form, - function (URLWildcardUpdateData $data) use ($urlWildcard, $form): Response { + function (URLWildcardUpdateData $data) use ($urlWildcard): Response { $urlWildcardUpdateStruct = new URLWildcardUpdateStruct(); $urlWildcardUpdateStruct->destinationUrl = $data->getDestinationUrl(); $urlWildcardUpdateStruct->sourceUrl = $data->getSourceURL(); @@ -129,14 +119,6 @@ function (URLWildcardUpdateData $data) use ($urlWildcard, $form): Response { 'ibexa_url_wildcard' ); - if ($form->getClickedButton() instanceof Button - && $form->getClickedButton()->getName() === URLWildcardUpdateType::BTN_SAVE - ) { - return $this->redirectToRoute('ibexa.url_wildcard.update', [ - 'urlWildcardId' => $urlWildcard->id, - ]); - } - return $this->redirectToRoute('ibexa.url_management', [ '_fragment' => URLWildcardsTab::URI_FRAGMENT, ]); diff --git a/src/bundle/Resources/translations/forms.en.xliff b/src/bundle/Resources/translations/forms.en.xliff index 9499b1a36a..0094b00f69 100644 --- a/src/bundle/Resources/translations/forms.en.xliff +++ b/src/bundle/Resources/translations/forms.en.xliff @@ -86,11 +86,6 @@ Name key: ezplatform.language.update.name - - Save - Save - key: ezplatform.language.update.save - Sub-items Sub-items @@ -111,11 +106,6 @@ Asset Fields(s) key: form.trash_assets_non_unique.label - - Save - Save - key: language.create.save - Save and close Save and close @@ -236,11 +226,6 @@ Name key: role_create.name - - Save - Save - key: role_create.save - Save and close Save and close @@ -256,14 +241,9 @@ Name key: role_update.name - + Save Save - key: role_update.save - - - Save and close - Save and close key: role_update.save_and_close @@ -286,16 +266,6 @@ Create key: section_create_form.create - - Save and edit - Save and edit - key: section_create_form.create_and_edit - - - Save and edit - Save and edit - key: section_create_form.update_and_edit - Delete Delete diff --git a/src/bundle/Resources/translations/ibexa_content_forms_content.en.xliff b/src/bundle/Resources/translations/ibexa_content_forms_content.en.xliff index 9fb5918efc..fb121977ef 100644 --- a/src/bundle/Resources/translations/ibexa_content_forms_content.en.xliff +++ b/src/bundle/Resources/translations/ibexa_content_forms_content.en.xliff @@ -6,191 +6,191 @@ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. - + Delete Delete key: content.field_type.ibexa_image.delete - + H:%height% px H:%height% px key: content.field_type.ibexa_image.dimensions.height - + Master dimension Master dimension key: content.field_type.ibexa_image.dimensions.label - + W:%width% px W:%width% px key: content.field_type.ibexa_image.dimensions.width - + File name File name key: content.field_type.ibexa_image.file_name.label - + Size Size key: content.field_type.ibexa_image.file_size.label - + Image stored in Field '%label%' Image stored in Field '%label%' key: content.field_type.ibexa_image.img_alt - + Preview Preview key: content.field_type.ibexa_image.preview - + File name File name key: content.field_type.ibexa_image_asset.file_name.label - + Image stored in Field '%label%' Image stored in Field '%label%' key: content.field_type.ibexa_image_asset.img_alt - + Delete Delete key: content.field_type.ibexa_media.delete - + Download Download key: content.field_type.ibexa_media.download - + File name File name key: content.field_type.ibexa_media.file_name.label - + Size Size key: content.field_type.ibexa_media.file_size.label - + Player settings Player settings key: content.field_type.ibexa_media.player_settings - + + Drag and drop file + Drag and drop file + key: fieldtype.binary_base.drag_drop + + + or + or + key: fieldtype.binary_base.drag_drop.or + + + Allowed extensions: %extensions% + Allowed extensions: %extensions% + key: fieldtype.binary_base.image_extensions + + + Max file size: %size% + Max file size: %size% + key: fieldtype.binary_base.max_file_size + + + Upload file + Upload file + key: fieldtype.binary_base.upload_file + + + Delete + Delete + key: fieldtype.ibexa_image_asset.delete + + + Select from library + Select from library + key: fieldtype.ibexa_image_asset.select.label + + + to choose a file]]> + to choose a file]]> + key: fieldtype.imageasset.drag_drop + + Download Download key: ibexa_binaryfile.action.download - + Delete Delete key: ibexa_binaryfile.action.remove - + File name File name key: ibexa_binaryfile.file_name.label - + Size Size key: ibexa_binaryfile.file_size.label - + Search address Search address key: ibexa_gmap_location.input.placeholder - + or enter geographical coordinates or enter geographical coordinates key: ibexa_gmap_location.text.info - + Stores a Relation to a Content item. Stores a Relation to a Content item. key: ibexa_object_relation.helper - + Select Item Select Item key: ibexa_object_relation_list.cta.select - + Delete Delete key: ibexa_object_relation_list.delete_selected_relations - + Stores Relations to other Content items. Stores Relations to other Content items. key: ibexa_object_relation_list.helper - + Content type Content type key: ibexa_object_relation_list.table.row.content_type - + Created Created key: ibexa_object_relation_list.table.row.created - + Name Name key: ibexa_object_relation_list.table.row.name - + Order Order key: ibexa_object_relation_list.table.row.order - - Drag and drop file - Drag and drop file - key: fieldtype.binary_base.drag_drop - - - or - or - key: fieldtype.binary_base.drag_drop.or - - - Allowed extensions: %extensions% - Allowed extensions: %extensions% - key: fieldtype.binary_base.image_extensions - - - Max file size: %size% - Max file size: %size% - key: fieldtype.binary_base.max_file_size - - - Upload file - Upload file - key: fieldtype.binary_base.upload_file - - - Delete - Delete - key: fieldtype.ibexa_image_asset.delete - - - Select from library - Select from library - key: fieldtype.ibexa_image_asset.select.label - - - to choose a file]]> - to choose a file]]> - key: fieldtype.imageasset.drag_drop - diff --git a/src/bundle/Resources/translations/ibexa_content_forms_role.en.xliff b/src/bundle/Resources/translations/ibexa_content_forms_role.en.xliff index d135857ff0..8f5f00932b 100644 --- a/src/bundle/Resources/translations/ibexa_content_forms_role.en.xliff +++ b/src/bundle/Resources/translations/ibexa_content_forms_role.en.xliff @@ -36,14 +36,9 @@ Delete key: policy_delete.delete - + Save Save - key: policy_update.save - - - Save and close - Save and close key: policy_update.save_and_close diff --git a/src/bundle/Resources/translations/ibexa_content_forms_url.en.xliff b/src/bundle/Resources/translations/ibexa_content_forms_url.en.xliff index 8df7f2987f..2153d36de9 100644 --- a/src/bundle/Resources/translations/ibexa_content_forms_url.en.xliff +++ b/src/bundle/Resources/translations/ibexa_content_forms_url.en.xliff @@ -6,11 +6,6 @@ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. - - Save - Save - key: url.save - Save and close Save and close diff --git a/src/bundle/Resources/translations/ibexa_content_type.en.xliff b/src/bundle/Resources/translations/ibexa_content_type.en.xliff index c330d9d853..f1787fe5f9 100644 --- a/src/bundle/Resources/translations/ibexa_content_type.en.xliff +++ b/src/bundle/Resources/translations/ibexa_content_type.en.xliff @@ -386,11 +386,6 @@ Name key: content_type_group.create.name - - Save - Save - key: content_type_group.create.save - Save and close Save and close @@ -426,11 +421,6 @@ Name key: content_type_group.update.name - - Save - Save - key: content_type_group.update.save - Save and close Save and close diff --git a/src/bundle/Resources/translations/ibexa_fieldtypes_edit.en.xliff b/src/bundle/Resources/translations/ibexa_fieldtypes_edit.en.xliff index 0db76e58d0..7f2d223cfc 100644 --- a/src/bundle/Resources/translations/ibexa_fieldtypes_edit.en.xliff +++ b/src/bundle/Resources/translations/ibexa_fieldtypes_edit.en.xliff @@ -6,36 +6,36 @@ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. - + + Area below needs correction + Area below needs correction + key: ezmaplocation.create.message.error + + H:%height% px H:%height% px key: ibexa_image.dimensions.height - + W:%width% px W:%width% px key: ibexa_image.dimensions.width - + Error while creating Image Asset: %error% Error while creating Image Asset: %error% key: ibexa_image_asset.create.message.error - + The image has been published and can now be reused The image has been published and can now be reused key: ibexa_image_asset.create.message.success - + The chosen asset has no image data available. The chosen asset has no image data available. key: ibexa_image_asset.empty_data.message.error - - Area below needs correction - Area below needs correction - key: ezmaplocation.create.message.error - diff --git a/src/bundle/Resources/translations/ibexa_fieldtypes_preview.en.xliff b/src/bundle/Resources/translations/ibexa_fieldtypes_preview.en.xliff index 137f374ab0..2def1311e1 100644 --- a/src/bundle/Resources/translations/ibexa_fieldtypes_preview.en.xliff +++ b/src/bundle/Resources/translations/ibexa_fieldtypes_preview.en.xliff @@ -6,242 +6,242 @@ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. - + No No key: ibexa_boolean.no - + Yes Yes key: ibexa_boolean.yes - + `The date format is based on your user preferences and does not include seconds even if the Field allows it` `The date format is based on your user preferences and does not include seconds even if the Field allows it` key: ibexa_datetime.useseconds.enabled - + Address Address key: ibexa_gmap_location.address - + Latitude Latitude key: ibexa_gmap_location.latitude - + Location properties Location properties key: ibexa_gmap_location.location_properties - + Longitude Longitude key: ibexa_gmap_location.longitude - + Alternative text Alternative text key: ibexa_image.alternative_text - + File name File name key: ibexa_image.file_name - + Image file properties Image file properties key: ibexa_image.image_file_properties - + Master dimensions Master dimensions key: ibexa_image.master_dimensions - + Ratio Ratio key: ibexa_image.ratio - + Size Size key: ibexa_image.size - + Width: %width%px height: %height%px Width: %width%px height: %height%px key: ibexa_image.width_and_height - + Alternative text Alternative text key: ibexa_image_asset.alternative_text - + File name File name key: ibexa_image_asset.file_name - + Image file properties Image file properties key: ibexa_image_asset.image_file_properties - + Master dimensions Master dimensions key: ibexa_image_asset.master_dimensions - + Image asset is not available (related content has been deleted or you have insufficient permissions) Image asset is not available (related content has been deleted or you have insufficient permissions) key: ibexa_image_asset.not_available - + Ratio Ratio key: ibexa_image_asset.ratio - + Size Size key: ibexa_image_asset.size - + Width: %width%px height: %height%px Width: %width%px height: %height%px key: ibexa_image_asset.width_and_height - + Autoplay Autoplay key: ibexa_media.auto_play - + Your browser does not support HTML5 video Your browser does not support HTML5 video key: ibexa_media.browser_does_not_support_html5_video - + Display controls Display controls key: ibexa_media.display_controls - + File name File name key: ibexa_media.file_name - + Loop Loop key: ibexa_media.loop - + No No key: ibexa_media.no - + Size Size key: ibexa_media.size - + Type Type key: ibexa_media.type - + Video file properties Video file properties key: ibexa_media.video_file_properties - + Yes Yes key: ibexa_media.yes - + Content type Content type key: ibexa_object_relation.content_type - + Name Name key: ibexa_object_relation.name - + Single relation Single relation key: ibexa_object_relation.single_relation - + Version created Version created key: ibexa_object_relation.version_created - + Content type Content type key: ibexa_object_relation_list.content_type - + Created Created key: ibexa_object_relation_list.created - + Multiple relations Multiple relations key: ibexa_object_relation_list.multiple_relations - + Name Name key: ibexa_object_relation_list.name - + Email Email key: ibexa_user.email - + Enabled Enabled key: ibexa_user.enabled - + No No key: ibexa_user.no - + Password has expired Password has expired key: ibexa_user.password_already_expired - + expires in %count% days]]> expires in %count% days]]> key: ibexa_user.password_expires_in - + expires today]]> expires today]]> key: ibexa_user.password_expires_today - + Username Username key: ibexa_user.username - + Yes Yes key: ibexa_user.yes diff --git a/src/bundle/Resources/translations/ibexa_menu.en.xliff b/src/bundle/Resources/translations/ibexa_menu.en.xliff index 7a21ad38a2..c313858d93 100644 --- a/src/bundle/Resources/translations/ibexa_menu.en.xliff +++ b/src/bundle/Resources/translations/ibexa_menu.en.xliff @@ -172,28 +172,18 @@ key: content_type_group_create__sidebar_right__cancel - Save and close - Save and close - key: content_type_group_create__sidebar_right__create - - Save Save - key: content_type_group_create__sidebar_right__create_and_edit + key: content_type_group_create__sidebar_right__create Discard changes Discard changes key: content_type_group_edit__sidebar_right__cancel - + Save Save - key: content_type_group_edit__sidebar_right__save - - - Save and close - Save and close key: content_type_group_edit__sidebar_right__save_and_close @@ -222,28 +212,18 @@ key: language_create__sidebar_right__cancel - Save and close - Save and close - key: language_create__sidebar_right__create - - Save Save - key: language_create__sidebar_right__create_and_edit + key: language_create__sidebar_right__create Discard changes Discard changes key: language_edit__sidebar_right__cancel - + Save Save - key: language_edit__sidebar_right__save - - - Save and close - Save and close key: language_edit__sidebar_right__save_and_close @@ -332,28 +312,18 @@ key: object_state_create__sidebar_right__cancel - Save and close - Save and close - key: object_state_create__sidebar_right__create - - Save Save - key: object_state_create__sidebar_right__create_and_edit + key: object_state_create__sidebar_right__create Discard changes Discard changes key: object_state_edit__sidebar_right__cancel - + Save Save - key: object_state_edit__sidebar_right__save - - - Save and close - Save and close key: object_state_edit__sidebar_right__save_and_close @@ -362,28 +332,18 @@ key: object_state_group_create__sidebar_right__cancel - Save and close - Save and close - key: object_state_group_create__sidebar_right__create - - Save Save - key: object_state_group_create__sidebar_right__create_and_edit + key: object_state_group_create__sidebar_right__create Discard changes Discard changes key: object_state_group_edit__sidebar_right__cancel - + Save Save - key: object_state_group_edit__sidebar_right__save - - - Save and close - Save and close key: object_state_group_edit__sidebar_right__save_and_close @@ -392,8 +352,8 @@ key: policy_create__sidebar_right__cancel - Save and close - Save and close + Save + Save key: policy_create__sidebar_right__create @@ -401,14 +361,9 @@ Discard changes key: policy_edit__sidebar_right__cancel - + Save Save - key: policy_edit__sidebar_right__save - - - Save and close - Save and close key: policy_edit__sidebar_right__save_and_close @@ -417,8 +372,8 @@ key: role_assignment_create__sidebar_right__cancel - Save and close - Save and close + Save + Save key: role_assignment_create__sidebar_right__save @@ -437,28 +392,18 @@ key: role_create__sidebar_right__cancel - Save and close - Save and close - key: role_create__sidebar_right__create - - Save Save - key: role_create__sidebar_right__create_and_edit + key: role_create__sidebar_right__create Discard changes Discard changes key: role_edit__sidebar_right__cancel - + Save Save - key: role_edit__sidebar_right__save - - - Save and close - Save and close key: role_edit__sidebar_right__save_and_close @@ -467,28 +412,18 @@ key: section_create__sidebar_right__cancel - Save and close - Save and close - key: section_create__sidebar_right__create - - Save Save - key: section_create__sidebar_right__create_and_edit + key: section_create__sidebar_right__create Discard changes Discard changes key: section_edit__sidebar_right__cancel - + Save Save - key: section_edit__sidebar_right__save - - - Save and close - Save and close key: section_edit__sidebar_right__save_and_close @@ -516,14 +451,9 @@ Discard changes key: url_edit__sidebar_right__cancel - + Save Save - key: url_edit__sidebar_right__save - - - Save and close - Save and close key: url_edit__sidebar_right__save_and_close @@ -531,14 +461,9 @@ Discard changes key: url_wildcard_edit__sidebar_right__cancel - + Save Save - key: url_wildcard_edit__sidebar_right__save - - - Save and close - Save and close key: url_wildcard_edit__sidebar_right__save_and_close @@ -582,8 +507,8 @@ key: user_password_change__sidebar_right__cancel - Save and close - Save and close + Save + Save key: user_password_change__sidebar_right__update @@ -592,14 +517,9 @@ key: user_setting_update__sidebar_right__cancel - Save and close - Save and close - key: user_setting_update__sidebar_right__save - - Save Save - key: user_setting_update__sidebar_right__save_end_edit + key: user_setting_update__sidebar_right__save diff --git a/src/bundle/Resources/translations/ibexa_object_state.en.xliff b/src/bundle/Resources/translations/ibexa_object_state.en.xliff index 50e4599314..eb251a4b02 100644 --- a/src/bundle/Resources/translations/ibexa_object_state.en.xliff +++ b/src/bundle/Resources/translations/ibexa_object_state.en.xliff @@ -41,11 +41,6 @@ Save and close key: object_state.create.create - - Save - Save - key: object_state.create.create_and_edit - Identifier Identifier @@ -106,11 +101,6 @@ Name key: object_state.update.name - - Save - Save - key: object_state.update.save - Save and close Save and close @@ -161,11 +151,6 @@ Save and close key: object_state_group.create.create - - Save - Save - key: object_state_group.create.create_and_edit - Identifier Identifier @@ -241,11 +226,6 @@ Name key: object_state_group.update.name - - Save - Save - key: object_state_group.update.save - Save and close Save and close diff --git a/src/bundle/Resources/translations/ibexa_universal_discovery_widget.en.xliff b/src/bundle/Resources/translations/ibexa_universal_discovery_widget.en.xliff index 5f0fd24e63..63cddd3085 100644 --- a/src/bundle/Resources/translations/ibexa_universal_discovery_widget.en.xliff +++ b/src/bundle/Resources/translations/ibexa_universal_discovery_widget.en.xliff @@ -121,21 +121,6 @@ Search... key: dropdown.placeholder - - Select Image Asset - Select Image Asset - key: ibexa_image_asset.title - - - Select Content item(s) - Select Content item(s) - key: ibexa_object_relation_list.title.multi - - - Select a Content item - Select a Content item - key: ibexa_object_relation_list.title.single - Apply Apply @@ -176,6 +161,21 @@ Filters key: filters.title + + Select Image Asset + Select Image Asset + key: ibexa_image_asset.title + + + Select Content item(s) + Select Content item(s) + key: ibexa_object_relation_list.title.multi + + + Select a Content item + Select a Content item + key: ibexa_object_relation_list.title.single + Items already added to the list are marked as selected and unable to deselect. Items already added to the list are marked as selected and unable to deselect. diff --git a/src/bundle/Resources/translations/ibexa_url_wildcard.en.xliff b/src/bundle/Resources/translations/ibexa_url_wildcard.en.xliff index beac85605c..85468ecdba 100644 --- a/src/bundle/Resources/translations/ibexa_url_wildcard.en.xliff +++ b/src/bundle/Resources/translations/ibexa_url_wildcard.en.xliff @@ -111,14 +111,9 @@ URL wildcard key: url_wildcard.modal.create.url.wildcard - + Save Save - key: url_wildcard.save - - - Save and close - Save and close key: url_wildcard.save_and_close diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff index de15fc429d..66c3d4c922 100644 --- a/src/bundle/Resources/translations/messages.en.xliff +++ b/src/bundle/Resources/translations/messages.en.xliff @@ -286,51 +286,6 @@ Something went wrong. Try to refresh the page or contact your administrator. key: error.request.default_msg - - Email - Email - key: ibexa_author.Email - - - Add - Add - key: ibexa_author.action.add - - - Delete - Delete - key: ibexa_author.action.delete - - - Name - Name - key: ibexa_author.name - - - Set up a Relation with one or several Items - Set up a Relation with one or several Items - key: ibexa_object_relation_list.cta.limit.multi - - - Set up a relation with one Content item - Set up a relation with one Content item - key: ibexa_object_relation_list.cta.limit.single - - - Relations max. %limit% - Relations max. %limit% - key: ibexa_object_relation_list.cta.limit.sub_text - - - Select Item - Select Item - key: ibexa_object_relation_list.cta.select - - - Delete - Delete - key: ibexa_object_relation_list.delete_selected_relations - Your password has expired, change it. Your password has expired, change it. @@ -423,6 +378,51 @@ We’ve sent to your email account a link to reset your password. key: ibexa.forgot_user_password.success.alert + + Email + Email + key: ibexa_author.Email + + + Add + Add + key: ibexa_author.action.add + + + Delete + Delete + key: ibexa_author.action.delete + + + Name + Name + key: ibexa_author.name + + + Set up a Relation with one or several Items + Set up a Relation with one or several Items + key: ibexa_object_relation_list.cta.limit.multi + + + Set up a relation with one Content item + Set up a relation with one Content item + key: ibexa_object_relation_list.cta.limit.single + + + Relations max. %limit% + Relations max. %limit% + key: ibexa_object_relation_list.cta.limit.sub_text + + + Select Item + Select Item + key: ibexa_object_relation_list.cta.select + + + Delete + Delete + key: ibexa_object_relation_list.delete_selected_relations + Delete Delete diff --git a/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig b/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig index 3ef7954e80..f86d23c591 100644 --- a/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig @@ -28,7 +28,6 @@ ) }} {% endfor %} {{ form_widget(form.update, {'attr': {'hidden': 'hidden'}}) }} - {{ form_widget(form.update_and_edit, { attr: { hidden: 'hidden' }}) }} {{ form_end(form) }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/create.html.twig b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/create.html.twig index 42bfed0584..91c0d4ae70 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/create.html.twig @@ -6,7 +6,6 @@ {% block header_admin %} {% set content_type_group_create_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.content_type_group_create.sidebar_right', [], { - save_id: form.save.vars.id, save_and_close_id: form.create.vars.id, }) %} @@ -27,7 +26,6 @@ - {{ form_widget(form.save, { attr: { hidden: 'hidden' }}) }} {{ form_widget(form.create, { attr: { hidden: 'hidden' }}) }} {{ form_end(form) }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/edit.html.twig b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/edit.html.twig index 04d514c73e..c44887f2e1 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/edit.html.twig @@ -6,7 +6,6 @@ {% block header_admin %} {% set content_type_group_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.content_type_group_edit.sidebar_right', [], { - save_id: form.save.vars.id, save_and_close_id: form.update.vars.id, }) %} @@ -28,7 +27,6 @@ - {{ form_widget(form.save, { attr: { hidden: 'hidden' }}) }} {{ form_widget(form.update, { attr: { hidden: 'hidden' }}) }} {{ form_end(form) }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/language/create.html.twig b/src/bundle/Resources/views/themes/admin/language/create.html.twig index fda35440ea..d54ec16e03 100644 --- a/src/bundle/Resources/views/themes/admin/language/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/create.html.twig @@ -6,7 +6,6 @@ {% block header_admin %} {% set language_create_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.language_create.sidebar_right', [], { - save_id: form.save.vars.id, save_and_close_id: form.save_and_close.vars.id, }) %} @@ -29,7 +28,6 @@ - {{ form_widget(form.save, { attr: { hidden: 'hidden' }}) }} {{ form_widget(form.save_and_close, { attr: { hidden: 'hidden' }}) }} {{ form_end(form) }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/language/edit.html.twig b/src/bundle/Resources/views/themes/admin/language/edit.html.twig index 0fa99632ca..a0d9e1728d 100644 --- a/src/bundle/Resources/views/themes/admin/language/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/edit.html.twig @@ -6,7 +6,6 @@ {% block header_admin %} {% set language_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.language_edit.sidebar_right', [], { - save_id: form.save.vars.id, save_and_close_id: form.save_and_close.vars.id, }) %} @@ -27,7 +26,6 @@ - {{ form_widget(form.save, { attr: { hidden: 'hidden' }}) }} {{ form_widget(form.save_and_close, { attr: { hidden: 'hidden' }}) }} {{ form_end(form) }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/link_manager/edit.html.twig b/src/bundle/Resources/views/themes/admin/link_manager/edit.html.twig index c3f2a4a489..22e6d803ce 100644 --- a/src/bundle/Resources/views/themes/admin/link_manager/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/link_manager/edit.html.twig @@ -7,7 +7,6 @@ {% block header %} {% set url_create_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.url_edit.sidebar_right', [], { save_and_close_selector: '#' ~ form.save_and_close.vars.id, - save_selector: '#' ~ form.save.vars.id, url: url }) %} @@ -31,7 +30,6 @@ - {{ form_widget(form.save, { attr: { hidden: 'hidden' }}) }} {{ form_widget(form.save_and_close, { attr: { hidden: 'hidden' }}) }} {{ form_end(form) }} diff --git a/src/bundle/Resources/views/themes/admin/object_state/add.html.twig b/src/bundle/Resources/views/themes/admin/object_state/add.html.twig index 3d5431b0ef..afbc37e56a 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/add.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/add.html.twig @@ -29,6 +29,5 @@ {{ form_widget(form.create, { 'attr': { 'hidden': 'hidden' } }) }} - {{ form_widget(form.create_and_edit, { attr: { hidden: 'hidden' }}) }} {{ form_end(form) }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/object_state/edit.html.twig b/src/bundle/Resources/views/themes/admin/object_state/edit.html.twig index a6d42c7517..24ecae68b4 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/edit.html.twig @@ -8,7 +8,6 @@ {% set object_state_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.object_state_edit.sidebar_right', [], { group_id: object_state_group.id, - save_id: form.save.vars.id, save_and_close_id: form.save_and_close.vars.id, }) %} @@ -30,7 +29,6 @@ - {{ form_widget(form.save, { 'attr': { 'hidden': 'hidden' } }) }} {{ form_widget(form.save_and_close, { attr: { hidden: 'hidden' }}) }} {{ form_end(form) }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/add.html.twig b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/add.html.twig index 900399820e..2af99c2f1c 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/add.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/add.html.twig @@ -25,6 +25,5 @@ {{ form_widget(form.create, { 'attr': { 'hidden': 'hidden' } }) }} - {{ form_widget(form.create_and_edit, { attr: { hidden: 'hidden' }}) }} {{ form_end(form) }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/edit.html.twig b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/edit.html.twig index 670514192f..ce9a80b789 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/edit.html.twig @@ -7,7 +7,6 @@ {% block header_admin %} {% set object_state_group_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.object_state_group_edit.sidebar_right', [], { - save_id: form.save.vars.id, save_and_close_id: form.save_and_close.vars.id, }) %} @@ -29,7 +28,6 @@ - {{ form_widget(form.save, {"attr": {"hidden": "hidden"}}) }} {{ form_widget(form.save_and_close, { attr: { hidden: 'hidden' }}) }} {{ form_end(form) }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/section/create.html.twig b/src/bundle/Resources/views/themes/admin/section/create.html.twig index 301f76a980..a59ed6ff6d 100644 --- a/src/bundle/Resources/views/themes/admin/section/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/section/create.html.twig @@ -23,6 +23,5 @@ {{ form_widget(form_section_create.create, {'attr': {'hidden': 'hidden'}}) }} - {{ form_widget(form_section_create.create_and_edit, { attr: { hidden: 'hidden' }}) }} {{ form_end(form_section_create) }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/section/update.html.twig b/src/bundle/Resources/views/themes/admin/section/update.html.twig index aff99ec47f..7a0d13ac61 100644 --- a/src/bundle/Resources/views/themes/admin/section/update.html.twig +++ b/src/bundle/Resources/views/themes/admin/section/update.html.twig @@ -25,6 +25,5 @@ {{ form_widget(form_section_update.update, {'attr': {'hidden': 'hidden'}}) }} - {{ form_widget(form_section_update.update_and_edit, { attr: { hidden: 'hidden' }}) }} {{ form_end(form_section_update) }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig index f5b7cd9901..a594103b62 100644 --- a/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig +++ b/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig @@ -16,7 +16,6 @@ {% block context_menu %} {% set url_create_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu_configure.url_wildcard_edit_sidebar_right', [], { submit_selector: '#' ~ form.save_and_close.vars.id, - save_selector: '#' ~ form.save.vars.id, }) %} {{ knp_menu_render(url_create_sidebar_right, {'template': '@ibexadesign/ui/menu/context_menu.html.twig'}) }} @@ -57,7 +56,6 @@ - {{ form_widget(form.save, { attr: { hidden: 'hidden' } }) }} {{ form_widget(form.save_and_close, { attr: { hidden: 'hidden' } }) }} {{ form_end(form) }} diff --git a/src/bundle/Resources/views/themes/admin/user/policy/edit.html.twig b/src/bundle/Resources/views/themes/admin/user/policy/edit.html.twig index 5863f5c217..2333a0c844 100644 --- a/src/bundle/Resources/views/themes/admin/user/policy/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/policy/edit.html.twig @@ -7,7 +7,6 @@ {% block header_admin %} {% set policy_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.policy_edit.sidebar_right', [], { role, - save_id: form.save.vars.id, save_and_close_id: form.save_and_close.vars.id, }) %} @@ -35,7 +34,6 @@ {% endfor %} - {{ form_widget(form.save, { attr: { hidden: 'hidden' }}) }} {{ form_widget(form.save_and_close, { attr: { hidden: 'hidden' }}) }} {{ form_end(form) }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/user/role/add.html.twig b/src/bundle/Resources/views/themes/admin/user/role/add.html.twig index 2d7e3ba1b9..5d3fe83165 100644 --- a/src/bundle/Resources/views/themes/admin/user/role/add.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role/add.html.twig @@ -6,7 +6,6 @@ {% block header_admin %} {% set role_create_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.role_create.sidebar_right', [], { - save_id: form.save.vars.id, save_and_close_id: form.save_and_close.vars.id, }) %} @@ -26,7 +25,6 @@ - {{ form_widget(form.save, { attr: { hidden: 'hidden' }}) }} {{ form_widget(form.save_and_close, { attr: { hidden: 'hidden' }}) }} {{ form_end(form) }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/user/role/edit.html.twig b/src/bundle/Resources/views/themes/admin/user/role/edit.html.twig index 6433ac4735..e3a8181a89 100644 --- a/src/bundle/Resources/views/themes/admin/user/role/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role/edit.html.twig @@ -7,7 +7,6 @@ {% block header_admin %} {% set role_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.role_edit.sidebar_right', [], { role, - save_id: form.save.vars.id, save_and_close_id: form.save_and_close.vars.id, }) %} @@ -27,7 +26,6 @@ - {{ form_widget(form.save, { attr: { hidden: 'hidden' }}) }} {{ form_widget(form.save_and_close, { attr: { hidden: 'hidden' }}) }} {{ form_end(form) }} {% endblock %} diff --git a/src/lib/EventListener/UserPasswordChangeRightSidebarListener.php b/src/lib/EventListener/UserPasswordChangeRightSidebarListener.php deleted file mode 100644 index 4223d421d0..0000000000 --- a/src/lib/EventListener/UserPasswordChangeRightSidebarListener.php +++ /dev/null @@ -1,77 +0,0 @@ -translator = $translator; - } - - /** - * @return array - */ - public static function getSubscribedEvents(): array - { - return [ConfigureMenuEvent::USER_PASSWORD_CHANGE_SIDEBAR_RIGHT => 'onUserPasswordChangeRightSidebarConfigure']; - } - - /** - * @param \Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent $event - */ - public function onUserPasswordChangeRightSidebarConfigure(ConfigureMenuEvent $event): void - { - $menu = $event->getMenu(); - - $menu->addChild( - self::ITEM__UPDATE, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => '#user_password_change_change', - ], - 'extras' => ['translation_domain' => 'ibexa_menu'], - ] - ); - $menu->addChild( - self::ITEM__CANCEL, - [ - 'extras' => ['translation_domain' => 'ibexa_menu'], - 'route' => 'ibexa.user_settings.list', - 'routeParameters' => [ - '_fragment' => 'ibexa-tab-my-account-settings', - ], - ] - ); - } - - /** - * @return \JMS\TranslationBundle\Model\Message[] - */ - public static function getTranslationMessages(): array - { - return [ - (new Message(self::ITEM__UPDATE, 'ibexa_menu'))->setDesc('Save and close'), - (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard'), - ]; - } -} diff --git a/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupCreateType.php b/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupCreateType.php index 1c3550603c..f2ab2328ae 100644 --- a/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupCreateType.php +++ b/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupCreateType.php @@ -18,8 +18,6 @@ class ContentTypeGroupCreateType extends AbstractType { - public const BTN_SAVE = 'save'; - public function buildForm(FormBuilderInterface $builder, array $options): void { $builder @@ -27,10 +25,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'label' => /** @Desc("Name") */ 'content_type_group.create.name', ]) ->add('create', SubmitType::class, [ - 'label' => /** @Desc("Save and close") */ 'content_type_group.create.submit', - ]) - ->add(self::BTN_SAVE, SubmitType::class, [ - 'label' => /** @Desc("Save") */ 'content_type_group.create.save', + 'label' => /** @Desc("Save") */ 'content_type_group.create.submit', ]); } diff --git a/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupUpdateType.php b/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupUpdateType.php index c3fac9da0a..c2b32959b1 100644 --- a/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupUpdateType.php +++ b/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupUpdateType.php @@ -18,8 +18,6 @@ class ContentTypeGroupUpdateType extends AbstractType { - public const BTN_SAVE = 'save'; - public function buildForm(FormBuilderInterface $builder, array $options): void { $builder @@ -27,10 +25,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'label' => /** @Desc("Name") */ 'content_type_group.update.name', ]) ->add('update', SubmitType::class, [ - 'label' => /** @Desc("Save and close") */ 'content_type_group.update.submit', - ]) - ->add(self::BTN_SAVE, SubmitType::class, [ - 'label' => /** @Desc("Save") */ 'content_type_group.update.save', + 'label' => /** @Desc("Save") */ 'content_type_group.update.submit', ]); } diff --git a/src/lib/Form/Type/Language/LanguageCreateType.php b/src/lib/Form/Type/Language/LanguageCreateType.php index f4443c0af5..52cd680670 100644 --- a/src/lib/Form/Type/Language/LanguageCreateType.php +++ b/src/lib/Form/Type/Language/LanguageCreateType.php @@ -17,8 +17,6 @@ class LanguageCreateType extends AbstractType { - public const BTN_SAVE = 'save'; - public function buildForm(FormBuilderInterface $builder, array $options): void { $builder @@ -40,15 +38,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'required' => false, ] ) - ->add( - self::BTN_SAVE, - SubmitType::class, - ['label' => /** @Desc("Save") */ 'language.create.save'] - ) ->add( 'save_and_close', SubmitType::class, - ['label' => /** @Desc("Save and close") */ 'language.create.save_and_close'] + ['label' => /** @Desc("Save") */ 'language.create.save_and_close'] ); } diff --git a/src/lib/Form/Type/Language/LanguageUpdateType.php b/src/lib/Form/Type/Language/LanguageUpdateType.php index abe02b5a5c..91527a8e4a 100644 --- a/src/lib/Form/Type/Language/LanguageUpdateType.php +++ b/src/lib/Form/Type/Language/LanguageUpdateType.php @@ -17,8 +17,6 @@ class LanguageUpdateType extends AbstractType { - public const BTN_SAVE = 'save'; - public function buildForm(FormBuilderInterface $builder, array $options): void { $builder @@ -40,15 +38,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'required' => false, ] ) - ->add( - self::BTN_SAVE, - SubmitType::class, - ['label' => /** @Desc("Save") */ 'ezplatform.language.update.save'] - ) ->add( 'save_and_close', SubmitType::class, - ['label' => /** @Desc("Save and close") */ 'language.update.save_and_close'] + ['label' => /** @Desc("Save") */ 'language.update.save_and_close'] ); } diff --git a/src/lib/Form/Type/ObjectState/ObjectStateCreateType.php b/src/lib/Form/Type/ObjectState/ObjectStateCreateType.php index f252f5d81b..0e3c9ba77f 100644 --- a/src/lib/Form/Type/ObjectState/ObjectStateCreateType.php +++ b/src/lib/Form/Type/ObjectState/ObjectStateCreateType.php @@ -18,8 +18,6 @@ class ObjectStateCreateType extends AbstractType { - public const BTN_CREATE_AND_EDIT = 'create_and_edit'; - public function buildForm(FormBuilderInterface $builder, array $options): void { $builder @@ -31,9 +29,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void ]) ->add('create', SubmitType::class, [ 'label' => /** @Desc("Save and close") */ 'object_state.create.create', - ]) - ->add(self::BTN_CREATE_AND_EDIT, SubmitType::class, [ - 'label' => /** @Desc("Save") */ 'object_state.create.create_and_edit', ]); } diff --git a/src/lib/Form/Type/ObjectState/ObjectStateGroupCreateType.php b/src/lib/Form/Type/ObjectState/ObjectStateGroupCreateType.php index 311607b2b2..3c29527fb8 100644 --- a/src/lib/Form/Type/ObjectState/ObjectStateGroupCreateType.php +++ b/src/lib/Form/Type/ObjectState/ObjectStateGroupCreateType.php @@ -18,8 +18,6 @@ class ObjectStateGroupCreateType extends AbstractType { - public const BTN_CREATE_AND_EDIT = 'create_and_edit'; - public function buildForm(FormBuilderInterface $builder, array $options): void { $builder @@ -31,9 +29,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void ]) ->add('create', SubmitType::class, [ 'label' => /** @Desc("Save and close") */ 'object_state_group.create.create', - ]) - ->add(self::BTN_CREATE_AND_EDIT, SubmitType::class, [ - 'label' => /** @Desc("Save") */ 'object_state_group.create.create_and_edit', ]); } diff --git a/src/lib/Form/Type/ObjectState/ObjectStateGroupUpdateType.php b/src/lib/Form/Type/ObjectState/ObjectStateGroupUpdateType.php index 0c833460c1..fc146e875a 100644 --- a/src/lib/Form/Type/ObjectState/ObjectStateGroupUpdateType.php +++ b/src/lib/Form/Type/ObjectState/ObjectStateGroupUpdateType.php @@ -18,8 +18,6 @@ class ObjectStateGroupUpdateType extends AbstractType { - public const BTN_SAVE = 'save'; - public function buildForm(FormBuilderInterface $builder, array $options): void { $builder @@ -29,9 +27,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void ->add('name', TextType::class, [ 'label' => /** @Desc("Name") */ 'object_state_group.update.name', ]) - ->add(self::BTN_SAVE, SubmitType::class, [ - 'label' => /** @Desc("Save") */ 'object_state_group.update.save', - ]) ->add('save_and_close', SubmitType::class, [ 'label' => /** @Desc("Save and close") */ 'object_state_group.update.save_and_close', ]); diff --git a/src/lib/Form/Type/ObjectState/ObjectStateUpdateType.php b/src/lib/Form/Type/ObjectState/ObjectStateUpdateType.php index ea5f9f3080..75e09fc55f 100644 --- a/src/lib/Form/Type/ObjectState/ObjectStateUpdateType.php +++ b/src/lib/Form/Type/ObjectState/ObjectStateUpdateType.php @@ -18,8 +18,6 @@ class ObjectStateUpdateType extends AbstractType { - public const BTN_SAVE = 'save'; - public function buildForm(FormBuilderInterface $builder, array $options): void { $builder @@ -29,9 +27,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void ->add('name', TextType::class, [ 'label' => /** @Desc("Name") */ 'object_state.update.name', ]) - ->add(self::BTN_SAVE, SubmitType::class, [ - 'label' => /** @Desc("Save") */ 'object_state.update.save', - ]) ->add('save_and_close', SubmitType::class, [ 'label' => /** @Desc("Save and close") */ 'object_state.update.save_and_close', ]); diff --git a/src/lib/Form/Type/Policy/PolicyUpdateType.php b/src/lib/Form/Type/Policy/PolicyUpdateType.php index bd3e44c275..73fa54488b 100644 --- a/src/lib/Form/Type/Policy/PolicyUpdateType.php +++ b/src/lib/Form/Type/Policy/PolicyUpdateType.php @@ -22,8 +22,6 @@ class PolicyUpdateType extends AbstractType { - public const BTN_SAVE = 'save'; - private RoleService $roleService; public function __construct(RoleService $roleService) @@ -43,15 +41,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'disabled' => true, ] ) - ->add( - self::BTN_SAVE, - SubmitType::class, - ['label' => /** @Desc("Save") */ 'policy_update.save'] - ) ->add( 'save_and_close', SubmitType::class, - ['label' => /** @Desc("Save and close") */ 'policy_update.save_and_close'] + ['label' => /** @Desc("Save") */ 'policy_update.save_and_close'] ); $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($options): void { diff --git a/src/lib/Form/Type/Role/RoleCreateType.php b/src/lib/Form/Type/Role/RoleCreateType.php index 35b8e8b41f..d5bf5cbacd 100644 --- a/src/lib/Form/Type/Role/RoleCreateType.php +++ b/src/lib/Form/Type/Role/RoleCreateType.php @@ -17,8 +17,6 @@ class RoleCreateType extends AbstractType { - public const BTN_SAVE = 'save'; - public function buildForm(FormBuilderInterface $builder, array $options): void { $builder @@ -27,15 +25,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void TextType::class, ['label' => /** @Desc("Name") */ 'role_create.name'] ) - ->add( - self::BTN_SAVE, - SubmitType::class, - ['label' => /** @Desc("Save") */ 'role_create.save'] - ) ->add( 'save_and_close', SubmitType::class, - ['label' => /** @Desc("Save and close") */ 'role_create.save_and_close'] + ['label' => /** @Desc("Save") */ 'role_create.save_and_close'] ); } diff --git a/src/lib/Form/Type/Role/RoleUpdateType.php b/src/lib/Form/Type/Role/RoleUpdateType.php index cdb5b4eba7..9ea83432fc 100644 --- a/src/lib/Form/Type/Role/RoleUpdateType.php +++ b/src/lib/Form/Type/Role/RoleUpdateType.php @@ -17,8 +17,6 @@ class RoleUpdateType extends AbstractType { - public const BTN_SAVE = 'save'; - public function buildForm(FormBuilderInterface $builder, array $options): void { $builder @@ -27,11 +25,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void TextType::class, ['label' => /** @Desc("Name") */ 'role_update.name'] ) - ->add(self::BTN_SAVE, SubmitType::class, [ - 'label' => /** @Desc("Save") */ 'role_update.save', - ]) ->add('save_and_close', SubmitType::class, [ - 'label' => /** @Desc("Save and close") */ 'role_update.save_and_close', + 'label' => /** @Desc("Save") */ 'role_update.save_and_close', ]); } diff --git a/src/lib/Form/Type/Section/SectionCreateType.php b/src/lib/Form/Type/Section/SectionCreateType.php index 22dc1385bb..43350b38fe 100644 --- a/src/lib/Form/Type/Section/SectionCreateType.php +++ b/src/lib/Form/Type/Section/SectionCreateType.php @@ -15,8 +15,6 @@ class SectionCreateType extends AbstractType { - public const BTN_CREATE_AND_EDIT = 'create_and_edit'; - protected SectionType $sectionType; public function __construct(SectionType $sectionType) @@ -32,10 +30,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void ->add('create', SubmitType::class, [ 'label' => /** @Desc("Create") */ 'section_create_form.create', - ]) - ->add(self::BTN_CREATE_AND_EDIT, SubmitType::class, [ - 'label' => /** @Desc("Save and edit") */ - 'section_create_form.create_and_edit', ]); } diff --git a/src/lib/Form/Type/Section/SectionUpdateType.php b/src/lib/Form/Type/Section/SectionUpdateType.php index b5be2c491a..975386b86f 100644 --- a/src/lib/Form/Type/Section/SectionUpdateType.php +++ b/src/lib/Form/Type/Section/SectionUpdateType.php @@ -15,8 +15,6 @@ class SectionUpdateType extends AbstractType { - public const BTN_UPDATE = 'update'; - protected SectionType $sectionType; public function __construct(SectionType $sectionType) @@ -29,13 +27,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void $this->sectionType->buildForm($builder, $options); $builder - ->add(self::BTN_UPDATE, SubmitType::class, [ + ->add('update', SubmitType::class, [ 'label' => /** @Desc("Save") */ 'section_update_form.update', - ]) - ->add('update_and_edit', SubmitType::class, [ - 'label' => /** @Desc("Save and edit") */ - 'section_create_form.update_and_edit', ]); } diff --git a/src/lib/Form/Type/URL/URLEditType.php b/src/lib/Form/Type/URL/URLEditType.php index 13c19ff6b4..ac70a49dfe 100644 --- a/src/lib/Form/Type/URL/URLEditType.php +++ b/src/lib/Form/Type/URL/URLEditType.php @@ -16,14 +16,9 @@ class URLEditType extends AbstractType { - public const BTN_SAVE = 'save'; - public function buildForm(FormBuilderInterface $builder, array $options): void { $builder->add('url', TextType::class) - ->add(self::BTN_SAVE, SubmitType::class, [ - 'label' => /** @Desc("Save") */ 'url.save', - ]) ->add('save_and_close', SubmitType::class, [ 'label' => /** @Desc("Save and close") */ 'url.save_and_close', ]); diff --git a/src/lib/Form/Type/URLWildcard/URLWildcardUpdateType.php b/src/lib/Form/Type/URLWildcard/URLWildcardUpdateType.php index 8a94d04007..541e99d379 100644 --- a/src/lib/Form/Type/URLWildcard/URLWildcardUpdateType.php +++ b/src/lib/Form/Type/URLWildcard/URLWildcardUpdateType.php @@ -19,8 +19,6 @@ final class URLWildcardUpdateType extends AbstractType { - public const BTN_SAVE = 'save'; - /** * {@inheritdoc} */ @@ -37,11 +35,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'label' => false, 'required' => false, ]) - ->add(self::BTN_SAVE, SubmitType::class, [ - 'label' => /** @Desc("Save") */ 'url_wildcard.save', - ]) ->add('save_and_close', SubmitType::class, [ - 'label' => /** @Desc("Save and close") */ 'url_wildcard.save_and_close', + 'label' => /** @Desc("Save") */ 'url_wildcard.save_and_close', ]); } diff --git a/src/lib/Menu/Admin/ContentType/ContentTypeGroupCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/ContentType/ContentTypeGroupCreateRightSidebarBuilder.php index b030e17489..15db1a2b62 100644 --- a/src/lib/Menu/Admin/ContentType/ContentTypeGroupCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ContentType/ContentTypeGroupCreateRightSidebarBuilder.php @@ -9,41 +9,16 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; -use Ibexa\Contracts\AdminUi\Menu\MenuItemFactoryInterface; use Ibexa\Contracts\Core\Repository\Exceptions as ApiExceptions; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Translation\TranslatorInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class ContentTypeGroupCreateRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { - /* Menu items */ public const ITEM__CREATE = 'content_type_group_create__sidebar_right__create'; - public const ITEM__CREATE_AND_EDIT = 'content_type_group_create__sidebar_right__create_and_edit'; public const ITEM__CANCEL = 'content_type_group_create__sidebar_right__cancel'; - private TranslatorInterface $translator; - - public function __construct( - MenuItemFactoryInterface $factory, - EventDispatcherInterface $eventDispatcher, - TranslatorInterface $translator - ) { - parent::__construct($factory, $eventDispatcher); - - $this->translator = $translator; - } - - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::CONTENT_TYPE_GROUP_CREATE_SIDEBAR_RIGHT; @@ -52,16 +27,13 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException * @throws ApiExceptions\BadStateException * @throws \InvalidArgumentException */ public function createStructure(array $options): ItemInterface { - $saveId = $options['save_id']; - $saveAncCloseId = $options['save_and_close_id']; + $saveAndCloseId = $options['save_and_close_id']; /** @var \Knp\Menu\ItemInterface|\Knp\Menu\ItemInterface[] $menu */ $menu = $this->factory->createItem('root'); @@ -71,17 +43,7 @@ public function createStructure(array $options): ItemInterface [ 'attributes' => [ 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveAncCloseId), - ], - ] - ); - - $saveAndCloseItem->addChild( - self::ITEM__CREATE_AND_EDIT, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveId), + 'data-click' => sprintf('#%s', $saveAndCloseId), ], ] ); @@ -105,8 +67,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save and close'), - (new Message(self::ITEM__CREATE_AND_EDIT, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard'), ]; } diff --git a/src/lib/Menu/Admin/ContentType/ContentTypeGroupEditRightSidebarBuilder.php b/src/lib/Menu/Admin/ContentType/ContentTypeGroupEditRightSidebarBuilder.php index b8affcf32f..72175adbf0 100644 --- a/src/lib/Menu/Admin/ContentType/ContentTypeGroupEditRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ContentType/ContentTypeGroupEditRightSidebarBuilder.php @@ -9,41 +9,16 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; -use Ibexa\Contracts\AdminUi\Menu\MenuItemFactoryInterface; use Ibexa\Contracts\Core\Repository\Exceptions as ApiExceptions; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Translation\TranslatorInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class ContentTypeGroupEditRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { - /* Menu items */ - public const ITEM__SAVE = 'content_type_group_edit__sidebar_right__save'; public const ITEM__SAVE_AND_CLOSE = 'content_type_group_edit__sidebar_right__save_and_close'; public const ITEM__CANCEL = 'content_type_group_edit__sidebar_right__cancel'; - private TranslatorInterface $translator; - - public function __construct( - MenuItemFactoryInterface $factory, - EventDispatcherInterface $eventDispatcher, - TranslatorInterface $translator - ) { - parent::__construct($factory, $eventDispatcher); - - $this->translator = $translator; - } - - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::CONTENT_TYPE_GROUP_EDIT_SIDEBAR_RIGHT; @@ -60,8 +35,7 @@ protected function getConfigureEventName(): string */ public function createStructure(array $options): ItemInterface { - $saveId = $options['save_id']; - $saveAncCloseId = $options['save_and_close_id']; + $saveAndCloseId = $options['save_and_close_id']; /** @var \Knp\Menu\ItemInterface|\Knp\Menu\ItemInterface[] $menu */ $menu = $this->factory->createItem('root'); @@ -71,17 +45,7 @@ public function createStructure(array $options): ItemInterface [ 'attributes' => [ 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveAncCloseId), - ], - ] - ); - - $saveAndCloseItem->addChild( - self::ITEM__SAVE, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveId), + 'data-click' => sprintf('#%s', $saveAndCloseId), ], ] ); @@ -105,8 +69,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), - (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save and close'), + (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } diff --git a/src/lib/Menu/Admin/Language/LanguageCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/Language/LanguageCreateRightSidebarBuilder.php index 091eadd5af..cdba80221d 100644 --- a/src/lib/Menu/Admin/Language/LanguageCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Language/LanguageCreateRightSidebarBuilder.php @@ -9,41 +9,16 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; -use Ibexa\Contracts\AdminUi\Menu\MenuItemFactoryInterface; use Ibexa\Contracts\Core\Repository\Exceptions as ApiExceptions; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Translation\TranslatorInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class LanguageCreateRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { - /* Menu items */ public const ITEM__CREATE = 'language_create__sidebar_right__create'; - public const ITEM__CREATE_AND_EDIT = 'language_create__sidebar_right__create_and_edit'; public const ITEM__CANCEL = 'language_create__sidebar_right__cancel'; - private TranslatorInterface $translator; - - public function __construct( - MenuItemFactoryInterface $factory, - EventDispatcherInterface $eventDispatcher, - TranslatorInterface $translator - ) { - parent::__construct($factory, $eventDispatcher); - - $this->translator = $translator; - } - - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::LANGUAGE_CREATE_SIDEBAR_RIGHT; @@ -52,16 +27,13 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException * @throws ApiExceptions\BadStateException * @throws \InvalidArgumentException */ public function createStructure(array $options): ItemInterface { - $saveId = $options['save_id']; - $saveAncCloseId = $options['save_and_close_id']; + $saveAndCloseId = $options['save_and_close_id']; /** @var \Knp\Menu\ItemInterface|\Knp\Menu\ItemInterface[] $menu */ $menu = $this->factory->createItem('root'); @@ -71,17 +43,7 @@ public function createStructure(array $options): ItemInterface [ 'attributes' => [ 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveAncCloseId), - ], - ] - ); - - $saveAndCloseItem->addChild( - self::ITEM__CREATE_AND_EDIT, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveId), + 'data-click' => sprintf('#%s', $saveAndCloseId), ], ] ); @@ -105,8 +67,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save and close'), - (new Message(self::ITEM__CREATE_AND_EDIT, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard'), ]; } diff --git a/src/lib/Menu/Admin/Language/LanguageEditRightSidebarBuilder.php b/src/lib/Menu/Admin/Language/LanguageEditRightSidebarBuilder.php index 056aca81db..0e78403bd6 100644 --- a/src/lib/Menu/Admin/Language/LanguageEditRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Language/LanguageEditRightSidebarBuilder.php @@ -9,41 +9,16 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; -use Ibexa\Contracts\AdminUi\Menu\MenuItemFactoryInterface; use Ibexa\Contracts\Core\Repository\Exceptions as ApiExceptions; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Translation\TranslatorInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class LanguageEditRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { - /* Menu items */ - public const ITEM__SAVE = 'language_edit__sidebar_right__save'; public const ITEM__SAVE_AND_CLOSE = 'language_edit__sidebar_right__save_and_close'; public const ITEM__CANCEL = 'language_edit__sidebar_right__cancel'; - private TranslatorInterface $translator; - - public function __construct( - MenuItemFactoryInterface $factory, - EventDispatcherInterface $eventDispatcher, - TranslatorInterface $translator - ) { - parent::__construct($factory, $eventDispatcher); - - $this->translator = $translator; - } - - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::LANGUAGE_EDIT_SIDEBAR_RIGHT; @@ -52,16 +27,13 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException * @throws ApiExceptions\BadStateException * @throws \InvalidArgumentException */ public function createStructure(array $options): ItemInterface { - $saveId = $options['save_id']; - $saveAncCloseId = $options['save_and_close_id']; + $saveAndCloseId = $options['save_and_close_id']; /** @var \Knp\Menu\ItemInterface|\Knp\Menu\ItemInterface[] $menu */ $menu = $this->factory->createItem('root'); @@ -71,17 +43,7 @@ public function createStructure(array $options): ItemInterface [ 'attributes' => [ 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveAncCloseId), - ], - ] - ); - - $saveAndCloseItem->addChild( - self::ITEM__SAVE, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveId), + 'data-click' => sprintf('#%s', $saveAndCloseId), ], ] ); @@ -105,8 +67,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), - (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save and close'), + (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } diff --git a/src/lib/Menu/Admin/ObjectState/ObjectStateCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/ObjectState/ObjectStateCreateRightSidebarBuilder.php index 947a4f9ff6..4e489dda03 100644 --- a/src/lib/Menu/Admin/ObjectState/ObjectStateCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ObjectState/ObjectStateCreateRightSidebarBuilder.php @@ -15,21 +15,12 @@ use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class ObjectStateCreateRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { /* Menu items */ public const ITEM__CREATE = 'object_state_create__sidebar_right__create'; - public const ITEM__CREATE_AND_EDIT = 'object_state_create__sidebar_right__create_and_edit'; public const ITEM__CANCEL = 'object_state_create__sidebar_right__cancel'; - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::OBJECT_STATE_CREATE_SIDEBAR_RIGHT; @@ -38,8 +29,6 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException * @throws ApiExceptions\BadStateException * @throws \InvalidArgumentException @@ -61,16 +50,6 @@ public function createStructure(array $options): ItemInterface ] ); - $createItem->addChild( - self::ITEM__CREATE_AND_EDIT, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => '#object_state_create_create_and_edit', - ], - ] - ); - $menu->setChildren([ self::ITEM__CREATE => $createItem, self::ITEM__CANCEL => $this->createMenuItem( @@ -93,8 +72,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save and close'), - (new Message(self::ITEM__CREATE_AND_EDIT, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } diff --git a/src/lib/Menu/Admin/ObjectState/ObjectStateEditRightSidebarBuilder.php b/src/lib/Menu/Admin/ObjectState/ObjectStateEditRightSidebarBuilder.php index 55633c3d2b..873058db64 100644 --- a/src/lib/Menu/Admin/ObjectState/ObjectStateEditRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ObjectState/ObjectStateEditRightSidebarBuilder.php @@ -15,15 +15,8 @@ use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class ObjectStateEditRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { - /* Menu items */ - public const ITEM__SAVE = 'object_state_edit__sidebar_right__save'; public const ITEM__SAVE_AND_CLOSE = 'object_state_edit__sidebar_right__save_and_close'; public const ITEM__CANCEL = 'object_state_edit__sidebar_right__cancel'; @@ -38,8 +31,6 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException * @throws ApiExceptions\BadStateException * @throws \InvalidArgumentException @@ -47,8 +38,7 @@ protected function getConfigureEventName(): string public function createStructure(array $options): ItemInterface { $groupId = $options['group_id']; - $saveId = $options['save_id']; - $saveAncCloseId = $options['save_and_close_id']; + $saveAndCloseId = $options['save_and_close_id']; /** @var \Knp\Menu\ItemInterface|\Knp\Menu\ItemInterface[] $menu */ $menu = $this->factory->createItem('root'); @@ -58,23 +48,13 @@ public function createStructure(array $options): ItemInterface [ 'attributes' => [ 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveAncCloseId), - ], - ] - ); - - $saveAndCloseItem->addChild( - self::ITEM__SAVE, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveId), + 'data-click' => sprintf('#%s', $saveAndCloseId), ], ] ); $menu->setChildren([ - self::ITEM__SAVE => $saveAndCloseItem, + self::ITEM__SAVE_AND_CLOSE => $saveAndCloseItem, self::ITEM__CANCEL => $this->createMenuItem( self::ITEM__CANCEL, [ @@ -95,8 +75,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), - (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save and close'), + (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } diff --git a/src/lib/Menu/Admin/ObjectState/ObjectStateGroupCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/ObjectState/ObjectStateGroupCreateRightSidebarBuilder.php index e2f93d1c54..d035cff5a4 100644 --- a/src/lib/Menu/Admin/ObjectState/ObjectStateGroupCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ObjectState/ObjectStateGroupCreateRightSidebarBuilder.php @@ -10,41 +10,16 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; -use Ibexa\Contracts\AdminUi\Menu\MenuItemFactoryInterface; use Ibexa\Contracts\Core\Repository\Exceptions as ApiExceptions; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Translation\TranslatorInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class ObjectStateGroupCreateRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { - /* Menu items */ public const ITEM__CREATE = 'object_state_group_create__sidebar_right__create'; - public const ITEM__CREATE_AND_EDIT = 'object_state_group_create__sidebar_right__create_and_edit'; public const ITEM__CANCEL = 'object_state_group_create__sidebar_right__cancel'; - private TranslatorInterface $translator; - - public function __construct( - MenuItemFactoryInterface $factory, - EventDispatcherInterface $eventDispatcher, - TranslatorInterface $translator - ) { - parent::__construct($factory, $eventDispatcher); - - $this->translator = $translator; - } - - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::OBJECT_STATE_GROUP_CREATE_SIDEBAR_RIGHT; @@ -53,8 +28,6 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException * @throws ApiExceptions\BadStateException * @throws \InvalidArgumentException @@ -74,16 +47,6 @@ public function createStructure(array $options): ItemInterface ] ); - $createItem->addChild( - self::ITEM__CREATE_AND_EDIT, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => '#object_state_group_create_create_and_edit', - ], - ] - ); - $menu->setChildren([ self::ITEM__CREATE => $createItem, self::ITEM__CANCEL => $this->createMenuItem( @@ -103,8 +66,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save and close'), - (new Message(self::ITEM__CREATE_AND_EDIT, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard'), ]; } diff --git a/src/lib/Menu/Admin/ObjectState/ObjectStateGroupEditRightSidebarBuilder.php b/src/lib/Menu/Admin/ObjectState/ObjectStateGroupEditRightSidebarBuilder.php index 0e30a43d97..6d7718c12f 100644 --- a/src/lib/Menu/Admin/ObjectState/ObjectStateGroupEditRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ObjectState/ObjectStateGroupEditRightSidebarBuilder.php @@ -10,41 +10,16 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; -use Ibexa\Contracts\AdminUi\Menu\MenuItemFactoryInterface; use Ibexa\Contracts\Core\Repository\Exceptions as ApiExceptions; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Translation\TranslatorInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class ObjectStateGroupEditRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { - /* Menu items */ - public const ITEM__SAVE = 'object_state_group_edit__sidebar_right__save'; public const ITEM__SAVE_AND_CLOSE = 'object_state_group_edit__sidebar_right__save_and_close'; public const ITEM__CANCEL = 'object_state_group_edit__sidebar_right__cancel'; - private TranslatorInterface $translator; - - public function __construct( - MenuItemFactoryInterface $factory, - EventDispatcherInterface $eventDispatcher, - TranslatorInterface $translator - ) { - parent::__construct($factory, $eventDispatcher); - - $this->translator = $translator; - } - - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::OBJECT_STATE_GROUP_EDIT_SIDEBAR_RIGHT; @@ -53,16 +28,13 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException * @throws ApiExceptions\BadStateException * @throws \InvalidArgumentException */ public function createStructure(array $options): ItemInterface { - $saveId = $options['save_id']; - $saveAncCloseId = $options['save_and_close_id']; + $saveAndCloseId = $options['save_and_close_id']; /** @var \Knp\Menu\ItemInterface|\Knp\Menu\ItemInterface[] $menu */ $menu = $this->factory->createItem('root'); @@ -72,17 +44,7 @@ public function createStructure(array $options): ItemInterface [ 'attributes' => [ 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveAncCloseId), - ], - ] - ); - - $saveAndCloseItem->addChild( - self::ITEM__SAVE, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveId), + 'data-click' => sprintf('#%s', $saveAndCloseId), ], ] ); @@ -106,8 +68,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), - (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save and close'), + (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } diff --git a/src/lib/Menu/Admin/Role/PolicyCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/Role/PolicyCreateRightSidebarBuilder.php index b1b957a192..0357cd1938 100644 --- a/src/lib/Menu/Admin/Role/PolicyCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Role/PolicyCreateRightSidebarBuilder.php @@ -14,20 +14,11 @@ use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class PolicyCreateRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { - /* Menu items */ public const ITEM__CREATE = 'policy_create__sidebar_right__create'; public const ITEM__CANCEL = 'policy_create__sidebar_right__cancel'; - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::POLICY_CREATE_SIDEBAR_RIGHT; @@ -36,8 +27,6 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException * @throws ApiExceptions\BadStateException * @throws \InvalidArgumentException @@ -81,7 +70,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save and close'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard'), ]; } diff --git a/src/lib/Menu/Admin/Role/PolicyEditRightSidebarBuilder.php b/src/lib/Menu/Admin/Role/PolicyEditRightSidebarBuilder.php index fdfcc5a135..7786a5467c 100644 --- a/src/lib/Menu/Admin/Role/PolicyEditRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Role/PolicyEditRightSidebarBuilder.php @@ -14,21 +14,11 @@ use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class PolicyEditRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { - /* Menu items */ - public const ITEM__SAVE = 'policy_edit__sidebar_right__save'; public const ITEM__SAVE_AND_CLOSE = 'policy_edit__sidebar_right__save_and_close'; public const ITEM__CANCEL = 'policy_edit__sidebar_right__cancel'; - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::POLICY_EDIT_SIDEBAR_RIGHT; @@ -37,8 +27,6 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException * @throws ApiExceptions\BadStateException * @throws \InvalidArgumentException @@ -47,8 +35,7 @@ public function createStructure(array $options): ItemInterface { /** @var \Ibexa\Contracts\Core\Repository\Values\User\Role $section */ $role = $options['role']; - $saveId = $options['save_id']; - $saveAncCloseId = $options['save_and_close_id']; + $saveAndCloseId = $options['save_and_close_id']; /** @var \Knp\Menu\ItemInterface|\Knp\Menu\ItemInterface[] $menu */ $menu = $this->factory->createItem('root'); @@ -58,17 +45,7 @@ public function createStructure(array $options): ItemInterface [ 'attributes' => [ 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveAncCloseId), - ], - ] - ); - - $saveAndCloseItem->addChild( - self::ITEM__SAVE, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveId), + 'data-click' => sprintf('#%s', $saveAndCloseId), ], ] ); @@ -95,8 +72,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), - (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save and close'), + (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } diff --git a/src/lib/Menu/Admin/Role/RoleAssignmentCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/Role/RoleAssignmentCreateRightSidebarBuilder.php index 9ca134aac8..b3350866fd 100644 --- a/src/lib/Menu/Admin/Role/RoleAssignmentCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Role/RoleAssignmentCreateRightSidebarBuilder.php @@ -14,20 +14,12 @@ use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class RoleAssignmentCreateRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { /* Menu items */ public const ITEM__SAVE = 'role_assignment_create__sidebar_right__save'; public const ITEM__CANCEL = 'role_assignment_create__sidebar_right__cancel'; - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::ROLE_ASSIGNMENT_CREATE_SIDEBAR_RIGHT; @@ -36,8 +28,6 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException * @throws ApiExceptions\BadStateException * @throws \InvalidArgumentException @@ -81,7 +71,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save and close'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard'), ]; } diff --git a/src/lib/Menu/Admin/Role/RoleCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/Role/RoleCreateRightSidebarBuilder.php index dde9698479..83da6cfad6 100644 --- a/src/lib/Menu/Admin/Role/RoleCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Role/RoleCreateRightSidebarBuilder.php @@ -9,41 +9,17 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; -use Ibexa\Contracts\AdminUi\Menu\MenuItemFactoryInterface; use Ibexa\Contracts\Core\Repository\Exceptions as ApiExceptions; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Translation\TranslatorInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class RoleCreateRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { /* Menu items */ public const ITEM__CREATE = 'role_create__sidebar_right__create'; - public const ITEM__CREATE_AND_EDIT = 'role_create__sidebar_right__create_and_edit'; public const ITEM__CANCEL = 'role_create__sidebar_right__cancel'; - private TranslatorInterface $translator; - - public function __construct( - MenuItemFactoryInterface $factory, - EventDispatcherInterface $eventDispatcher, - TranslatorInterface $translator - ) { - parent::__construct($factory, $eventDispatcher); - - $this->translator = $translator; - } - - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::ROLE_CREATE_SIDEBAR_RIGHT; @@ -52,16 +28,13 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException * @throws ApiExceptions\BadStateException * @throws \InvalidArgumentException */ public function createStructure(array $options): ItemInterface { - $saveId = $options['save_id']; - $saveAncCloseId = $options['save_and_close_id']; + $saveAndCloseId = $options['save_and_close_id']; /** @var \Knp\Menu\ItemInterface|\Knp\Menu\ItemInterface[] $menu */ $menu = $this->factory->createItem('root'); @@ -71,17 +44,7 @@ public function createStructure(array $options): ItemInterface [ 'attributes' => [ 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveAncCloseId), - ], - ] - ); - - $saveAndCloseItem->addChild( - self::ITEM__CREATE_AND_EDIT, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveId), + 'data-click' => sprintf('#%s', $saveAndCloseId), ], ] ); @@ -105,8 +68,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save and close'), - (new Message(self::ITEM__CREATE_AND_EDIT, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard'), ]; } diff --git a/src/lib/Menu/Admin/Role/RoleEditRightSidebarBuilder.php b/src/lib/Menu/Admin/Role/RoleEditRightSidebarBuilder.php index 904f19e5bc..26d064f276 100644 --- a/src/lib/Menu/Admin/Role/RoleEditRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Role/RoleEditRightSidebarBuilder.php @@ -9,41 +9,16 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; -use Ibexa\Contracts\AdminUi\Menu\MenuItemFactoryInterface; use Ibexa\Contracts\Core\Repository\Exceptions as ApiExceptions; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Translation\TranslatorInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class RoleEditRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { - /* Menu items */ - public const ITEM__SAVE = 'role_edit__sidebar_right__save'; public const ITEM__SAVE_AND_CLOSE = 'role_edit__sidebar_right__save_and_close'; public const ITEM__CANCEL = 'role_edit__sidebar_right__cancel'; - private TranslatorInterface $translator; - - public function __construct( - MenuItemFactoryInterface $factory, - EventDispatcherInterface $eventDispatcher, - TranslatorInterface $translator - ) { - parent::__construct($factory, $eventDispatcher); - - $this->translator = $translator; - } - - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::ROLE_EDIT_SIDEBAR_RIGHT; @@ -52,18 +27,13 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException * @throws ApiExceptions\BadStateException * @throws \InvalidArgumentException */ public function createStructure(array $options): ItemInterface { - /** @var \Ibexa\Contracts\Core\Repository\Values\User\Role $role */ - $role = $options['role']; - $saveId = $options['save_id']; - $saveAncCloseId = $options['save_and_close_id']; + $saveAndCloseId = $options['save_and_close_id']; /** @var \Knp\Menu\ItemInterface|\Knp\Menu\ItemInterface[] $menu */ $menu = $this->factory->createItem('root'); @@ -73,17 +43,7 @@ public function createStructure(array $options): ItemInterface [ 'attributes' => [ 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveAncCloseId), - ], - ] - ); - - $saveAndCloseItem->addChild( - self::ITEM__SAVE, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#%s', $saveId), + 'data-click' => sprintf('#%s', $saveAndCloseId), ], ] ); @@ -107,8 +67,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), - (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save and close'), + (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } diff --git a/src/lib/Menu/SectionCreateRightSidebarBuilder.php b/src/lib/Menu/SectionCreateRightSidebarBuilder.php index 77410f8e61..52d6972076 100644 --- a/src/lib/Menu/SectionCreateRightSidebarBuilder.php +++ b/src/lib/Menu/SectionCreateRightSidebarBuilder.php @@ -9,41 +9,17 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; -use Ibexa\Contracts\AdminUi\Menu\MenuItemFactoryInterface; use Ibexa\Contracts\Core\Repository\Exceptions as ApiExceptions; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Translation\TranslatorInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class SectionCreateRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { /* Menu items */ public const ITEM__CREATE = 'section_create__sidebar_right__create'; - public const ITEM__CREATE_AND_EDIT = 'section_create__sidebar_right__create_and_edit'; public const ITEM__CANCEL = 'section_create__sidebar_right__cancel'; - private TranslatorInterface $translator; - - public function __construct( - MenuItemFactoryInterface $factory, - EventDispatcherInterface $eventDispatcher, - TranslatorInterface $translator - ) { - parent::__construct($factory, $eventDispatcher); - - $this->translator = $translator; - } - - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::SECTION_CREATE_SIDEBAR_RIGHT; @@ -52,8 +28,6 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException * @throws ApiExceptions\BadStateException * @throws \InvalidArgumentException @@ -73,16 +47,6 @@ public function createStructure(array $options): ItemInterface ] ); - $createItem->addChild( - self::ITEM__CREATE_AND_EDIT, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => '#section_create_create_and_edit', - ], - ] - ); - $menu->setChildren([ self::ITEM__CREATE => $createItem, self::ITEM__CANCEL => $this->createMenuItem( @@ -102,8 +66,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save and close'), - (new Message(self::ITEM__CREATE_AND_EDIT, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard'), ]; } diff --git a/src/lib/Menu/SectionEditRightSidebarBuilder.php b/src/lib/Menu/SectionEditRightSidebarBuilder.php index 07785bfee0..cb64ca4960 100644 --- a/src/lib/Menu/SectionEditRightSidebarBuilder.php +++ b/src/lib/Menu/SectionEditRightSidebarBuilder.php @@ -9,42 +9,16 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; -use Ibexa\Contracts\AdminUi\Menu\MenuItemFactoryInterface; use Ibexa\Contracts\Core\Repository\Exceptions as ApiExceptions; -use Ibexa\Contracts\Core\Repository\Values\Content\Section; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Translation\TranslatorInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class SectionEditRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { - /* Menu items */ - public const ITEM__SAVE = 'section_edit__sidebar_right__save'; public const ITEM__SAVE_AND_CLOSE = 'section_edit__sidebar_right__save_and_close'; public const ITEM__CANCEL = 'section_edit__sidebar_right__cancel'; - private TranslatorInterface $translator; - - public function __construct( - MenuItemFactoryInterface $factory, - EventDispatcherInterface $eventDispatcher, - TranslatorInterface $translator - ) { - parent::__construct($factory, $eventDispatcher); - - $this->translator = $translator; - } - - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::SECTION_EDIT_SIDEBAR_RIGHT; @@ -77,16 +51,6 @@ public function createStructure(array $options): ItemInterface ] ); - $saveAndCloseItem->addChild( - self::ITEM__SAVE, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => sprintf('#update-section-%d_update_and_edit', $section->id), - ], - ] - ); - $menu->setChildren([ self::ITEM__SAVE_AND_CLOSE => $saveAndCloseItem, self::ITEM__CANCEL => $this->createMenuItem( @@ -106,8 +70,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), - (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save and close'), + (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } diff --git a/src/lib/Menu/URLEditRightSidebarBuilder.php b/src/lib/Menu/URLEditRightSidebarBuilder.php index c4bc31197d..1233ab1232 100644 --- a/src/lib/Menu/URLEditRightSidebarBuilder.php +++ b/src/lib/Menu/URLEditRightSidebarBuilder.php @@ -9,32 +9,15 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; -use Ibexa\Contracts\AdminUi\Menu\MenuItemFactoryInterface; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Translation\TranslatorInterface; class URLEditRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { - /* Menu items */ - public const ITEM__SAVE = 'url_edit__sidebar_right__save'; public const ITEM__SAVE_AND_CLOSE = 'url_edit__sidebar_right__save_and_close'; public const ITEM__CANCEL = 'url_edit__sidebar_right__cancel'; - private TranslatorInterface $translator; - - public function __construct( - MenuItemFactoryInterface $factory, - EventDispatcherInterface $eventDispatcher, - TranslatorInterface $translator - ) { - parent::__construct($factory, $eventDispatcher); - - $this->translator = $translator; - } - protected function getConfigureEventName(): string { return ConfigureMenuEvent::URL_EDIT_SIDEBAR_RIGHT; @@ -42,9 +25,6 @@ protected function getConfigureEventName(): string protected function createStructure(array $options): ItemInterface { - /** @var \Ibexa\Contracts\Core\Repository\Values\URL\URL $url */ - $url = $options['url']; - /** @var \Knp\Menu\ItemInterface|\Knp\Menu\ItemInterface[] $menu */ $menu = $this->factory->createItem('root'); @@ -58,16 +38,6 @@ protected function createStructure(array $options): ItemInterface ] ); - $saveAndCloseItem->addChild( - self::ITEM__SAVE, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => $options['save_selector'], - ], - ] - ); - $menu->setChildren([ self::ITEM__SAVE_AND_CLOSE => $saveAndCloseItem, self::ITEM__CANCEL => $this->createMenuItem( @@ -84,8 +54,7 @@ protected function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), - (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save and close'), + (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } diff --git a/src/lib/Menu/URLWildcardEditRightSidebarBuilder.php b/src/lib/Menu/URLWildcardEditRightSidebarBuilder.php index b5ef4662e6..8e0f7d2608 100644 --- a/src/lib/Menu/URLWildcardEditRightSidebarBuilder.php +++ b/src/lib/Menu/URLWildcardEditRightSidebarBuilder.php @@ -10,42 +10,19 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\AdminUi\Tab\URLManagement\URLWildcardsTab; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; -use Ibexa\Contracts\AdminUi\Menu\MenuItemFactoryInterface; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Translation\TranslatorInterface; final class URLWildcardEditRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { - /* Menu items */ - public const ITEM__SAVE = 'url_wildcard_edit__sidebar_right__save'; public const ITEM__SAVE_AND_CLOSE = 'url_wildcard_edit__sidebar_right__save_and_close'; public const ITEM__CANCEL = 'url_wildcard_edit__sidebar_right__cancel'; - private TranslatorInterface $translator; - - /** - * @param \Ibexa\Contracts\AdminUi\Menu\MenuItemFactoryInterface $menuItemFactory - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher - * @param \Symfony\Contracts\Translation\TranslatorInterface $translator - */ - public function __construct( - MenuItemFactoryInterface $menuItemFactory, - EventDispatcherInterface $eventDispatcher, - TranslatorInterface $translator - ) { - parent::__construct($menuItemFactory, $eventDispatcher); - - $this->translator = $translator; - } - public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), - (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save and close'), + (new Message(self::ITEM__SAVE_AND_CLOSE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } @@ -70,16 +47,6 @@ protected function createStructure(array $options): ItemInterface ] ); - $saveAndCloseItem->addChild( - self::ITEM__SAVE, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => $options['save_selector'], - ], - ] - ); - $menu->setChildren([ self::ITEM__SAVE_AND_CLOSE => $saveAndCloseItem, self::ITEM__CANCEL => $this->createMenuItem( diff --git a/src/lib/Menu/UserPasswordChangeRightSidebarBuilder.php b/src/lib/Menu/UserPasswordChangeRightSidebarBuilder.php index 877c89c517..56443567c5 100644 --- a/src/lib/Menu/UserPasswordChangeRightSidebarBuilder.php +++ b/src/lib/Menu/UserPasswordChangeRightSidebarBuilder.php @@ -10,37 +10,17 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; -use Ibexa\Contracts\AdminUi\Menu\MenuItemFactoryInterface; use Ibexa\Contracts\Core\Repository\Exceptions as ApiExceptions; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Translation\TranslatorInterface; -/** - * KnpMenuBundle Menu Builder service implementation for AdminUI change password contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class UserPasswordChangeRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { /* Menu items */ public const ITEM__UPDATE = 'user_password_change__sidebar_right__update'; public const ITEM__CANCEL = 'user_password_change__sidebar_right__cancel'; - private TranslatorInterface $translator; - - public function __construct( - MenuItemFactoryInterface $factory, - EventDispatcherInterface $eventDispatcher, - TranslatorInterface $translator - ) { - parent::__construct($factory, $eventDispatcher); - - $this->translator = $translator; - } - /** * @return string */ @@ -52,8 +32,6 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException * @throws ApiExceptions\BadStateException * @throws \InvalidArgumentException @@ -93,7 +71,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__UPDATE, 'ibexa_menu'))->setDesc('Save and close'), + (new Message(self::ITEM__UPDATE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard'), ]; } diff --git a/src/lib/Menu/UserSetting/UserSettingUpdateRightSidebarBuilder.php b/src/lib/Menu/UserSetting/UserSettingUpdateRightSidebarBuilder.php index 644bc302a3..cb2cdb751a 100644 --- a/src/lib/Menu/UserSetting/UserSettingUpdateRightSidebarBuilder.php +++ b/src/lib/Menu/UserSetting/UserSettingUpdateRightSidebarBuilder.php @@ -15,35 +15,20 @@ use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contracts\Translation\TranslatorInterface; -/** - * KnpMenuBundle Menu Builder service implementation for User Setting Edit contextual sidebar menu. - * - * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html - */ class UserSettingUpdateRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface { /* Menu items */ public const ITEM__SAVE = 'user_setting_update__sidebar_right__save'; - public const ITEM__SAVE_AND_EDIT = 'user_setting_update__sidebar_right__save_end_edit'; public const ITEM__CANCEL = 'user_setting_update__sidebar_right__cancel'; - private TranslatorInterface $translator; - public function __construct( MenuItemFactoryInterface $factory, EventDispatcherInterface $eventDispatcher, - TranslatorInterface $translator ) { parent::__construct($factory, $eventDispatcher); - - $this->translator = $translator; } - /** - * @return string - */ protected function getConfigureEventName(): string { return ConfigureMenuEvent::USER_SETTING_UPDATE_SIDEBAR_RIGHT; @@ -52,8 +37,6 @@ protected function getConfigureEventName(): string /** * @param array $options * - * @return \Knp\Menu\ItemInterface - * * @throws \InvalidArgumentException */ public function createStructure(array $options): ItemInterface @@ -71,19 +54,6 @@ public function createStructure(array $options): ItemInterface ] ); - $saveItem->addChild( - self::ITEM__SAVE_AND_EDIT, - [ - 'attributes' => [ - 'class' => 'ibexa-btn--trigger', - 'data-click' => '#user_setting_update_update_and_edit', - ], - 'extras' => [ - 'orderNumber' => 10, - ], - ] - ); - $menu->setChildren([ self::ITEM__SAVE => $saveItem, self::ITEM__CANCEL => $this->createMenuItem( @@ -103,8 +73,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save and close'), - (new Message(self::ITEM__SAVE_AND_EDIT, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard'), ]; }