Merged branch '2.2'

src/bundle/Controller/LocationController.php

@@ -459,7 +459,7 @@ public function removeAction(Request $request): Response
 
                 foreach ($data->getLocations() as $locationId => $selected) {
                     $location = $this->locationService->loadLocation($locationId);
-                    $this->locationService->deleteLocation($location);
+                    $this->trashService->trash($location);
 
                     $this->notificationHandler->success(
                         /** @Desc("Location '%name%' removed.") */

src/bundle/Resources/translations/locationview.en.xliff

@@ -197,8 +197,8 @@
         <note>key: tab.locations.main</note>
       </trans-unit>
       <trans-unit id="e704444c07d73c053f58f427ebcc0b6b2042c63d" resname="tab.locations.modal.message">
-        <source>Do you want to delete the Location?</source>
-        <target state="new">Do you want to delete the Location?</target>
+        <source>Do you want to delete the Location? All its sub-items will be sent to Trash.</source>
+        <target state="new">Do you want to delete the Location? All its sub-items will be sent to Trash.</target>
         <note>key: tab.locations.modal.message</note>
       </trans-unit>
       <trans-unit id="7514a2a1e82c82fa3a197dc3da8be56a9c68f136" resname="tab.locations.path">

src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig

@@ -112,7 +112,7 @@
     </button>
     {% include '@ezdesign/ui/modal/bulk_delete_confirmation.html.twig' with {
         'id': modal_data_target,
-        'message': 'tab.locations.modal.message'|trans|desc('Do you want to delete the Location?'),
+        'message': 'tab.locations.modal.message'|trans|desc('Do you want to delete the Location? All its sub-items will be sent to Trash.'),
         'data_click': '#' ~ form_remove.remove.vars.id,
     } %}
 {% endmacro %}