EZP-30639: Used Content view instead of deprecated Location view

ezsystems · Feb 5, 2020 · ca90f01 · ca90f01
1 parent d7df11d
commit ca90f01
Show file tree

Hide file tree

Showing 32 changed files with 99 additions and 73 deletions.
diff --git a/src/bundle/Controller/ContentController.php b/src/bundle/Controller/ContentController.php
@@ -244,7 +244,8 @@ public function editAction(Request $request): Response
         $contentInfo = $data->getContentInfo();
 
         if (null !== $contentInfo) {
-            return $this->redirectToRoute('_ezpublishLocation', [
+            return $this->redirectToRoute('_ez_content_view', [
+                'contentId' => $contentInfo->id,
                 'locationId' => $contentInfo->mainLocationId,
             ]);
         }
@@ -284,7 +285,8 @@ public function updateMainLocationAction(Request $request): Response
                     'content'
                 );
 
-                return new RedirectResponse($this->generateUrl('_ezpublishLocation', [
+                return new RedirectResponse($this->generateUrl('_ez_content_view', [
+                    'contentId' => $contentInfo->id,
                     'locationId' => $contentInfo->mainLocationId,
                     '_fragment' => 'ez-tab-location-view-locations',
                 ]));
@@ -300,7 +302,8 @@ public function updateMainLocationAction(Request $request): Response
         $contentInfo = $data->getContentInfo();
 
         if (null !== $contentInfo) {
-            return new RedirectResponse($this->generateUrl('_ezpublishLocation', [
+            return new RedirectResponse($this->generateUrl('_ez_content_view', [
+                'contentId' => $contentInfo->id,
                 'locationId' => $contentInfo->mainLocationId,
                 '_fragment' => 'ez-tab-location-view-locations',
             ]));
@@ -381,7 +384,8 @@ public function updateMainTranslationAction(Request $request): Response
                     'content'
                 );
 
-                return new RedirectResponse($this->generateUrl('_ezpublishLocation', [
+                return new RedirectResponse($this->generateUrl('_ez_content_view', [
+                    'contentId' => $contentInfo->id,
                     'locationId' => $contentInfo->mainLocationId,
                     '_fragment' => 'ez-tab-location-view-translations',
                 ]));
@@ -394,7 +398,8 @@ public function updateMainTranslationAction(Request $request): Response
         $data = $form->getData();
         $contentInfo = $data->getContentInfo();
         if (null !== $contentInfo) {
-            return new RedirectResponse($this->generateUrl('_ezpublishLocation', [
+            return new RedirectResponse($this->generateUrl('_ez_content_view', [
+                'contentId' => $contentInfo->id,
                 'locationId' => $contentInfo->mainLocationId,
                 '_fragment' => 'ez-tab-location-view-translations',
             ]));

diff --git a/src/bundle/Controller/Controller.php b/src/bundle/Controller/Controller.php
@@ -25,7 +25,8 @@ public function performAccessCheck()
      */
     public function redirectToLocation(Location $location, string $uriFragment = ''): RedirectResponse
     {
-        return $this->redirectToRoute('_ezpublishLocation', [
+        return $this->redirectToRoute('_ez_content_view', [
+            'contentId' => $location->contentId,
             'locationId' => $location->id,
             '_fragment' => $uriFragment,
         ]);

diff --git a/src/bundle/Controller/LocationController.php b/src/bundle/Controller/LocationController.php
@@ -157,7 +157,8 @@ public function moveAction(Request $request): Response
                     'location'
                 );
 
-                return new RedirectResponse($this->generateUrl('_ezpublishLocation', [
+                return new RedirectResponse($this->generateUrl('_ez_content_view', [
+                    'contentId' => $location->contentId,
                     'locationId' => $location->id,
                 ]));
             });
@@ -167,7 +168,8 @@ public function moveAction(Request $request): Response
             }
         }
 
-        return $this->redirect($this->generateUrl('_ezpublishLocation', [
+        return $this->redirect($this->generateUrl('_ez_content_view', [
+            'contentId' => $location->contentId,
             'locationId' => $location->id,
         ]));
     }
@@ -213,7 +215,8 @@ public function copyAction(Request $request): Response
                     'location'
                 );
 
-                return new RedirectResponse($this->generateUrl('_ezpublishLocation', [
+                return new RedirectResponse($this->generateUrl('_ez_content_view', [
+                    'contentId' => $location->contentId,
                     'locationId' => $newLocation->id,
                 ]));
             });
@@ -223,7 +226,8 @@ public function copyAction(Request $request): Response
             }
         }
 
-        return $this->redirect($this->generateUrl('_ezpublishLocation', [
+        return $this->redirect($this->generateUrl('_ez_content_view', [
+            'contentId' => $location->contentId,
             'locationId' => $location->id,
         ]));
     }
@@ -310,7 +314,8 @@ public function swapAction(Request $request): Response
                     'location'
                 );
 
-                return new RedirectResponse($this->generateUrl('_ezpublishLocation', [
+                return new RedirectResponse($this->generateUrl('_ez_content_view', [
+                    'contentId' => $newLocation->contentId,
                     'locationId' => $newLocation->id,
                     '_fragment' => LocationsTab::URI_FRAGMENT,
                 ]));
@@ -321,7 +326,8 @@ public function swapAction(Request $request): Response
             }
         }
 
-        return $this->redirect($this->generateUrl('_ezpublishLocation', [
+        return $this->redirect($this->generateUrl('_ez_content_view', [
+            'contentId' => $location->contentId,
             'locationId' => $location->id,
             '_fragment' => LocationsTab::URI_FRAGMENT,
         ]));
@@ -424,7 +430,8 @@ private function handleTrashLocationForm($data): RedirectResponse
             )
         );
 
-        return new RedirectResponse($this->generateUrl('_ezpublishLocation', [
+        return new RedirectResponse($this->generateUrl('_ez_content_view', [
+            'contentId' => $parentLocation->contentId,
             'locationId' => $parentLocation->id,
         ]));
     }
@@ -462,7 +469,8 @@ public function removeAction(Request $request): Response
                     );
                 }
 
-                return new RedirectResponse($this->generateUrl('_ezpublishLocation', [
+                return new RedirectResponse($this->generateUrl('_ez_content_view', [
+                    'contentId' => $contentInfo->id,
                     'locationId' => $contentInfo->mainLocationId,
                     '_fragment' => LocationsTab::URI_FRAGMENT,
                 ]));
@@ -473,7 +481,8 @@ public function removeAction(Request $request): Response
             }
         }
 
-        return $this->redirect($this->generateUrl('_ezpublishLocation', [
+        return $this->redirect($this->generateUrl('_ez_content_view', [
+            'contentId' => $contentInfo->id,
             'locationId' => $contentInfo->mainLocationId,
             '_fragment' => LocationsTab::URI_FRAGMENT,
         ]));
@@ -511,7 +520,8 @@ public function addAction(Request $request): Response
                     );
                 }
 
-                return new RedirectResponse($this->generateUrl('_ezpublishLocation', [
+                return new RedirectResponse($this->generateUrl('_ez_content_view', [
+                    'contentId' => $contentInfo->id,
                     'locationId' => $contentInfo->mainLocationId,
                     '_fragment' => LocationsTab::URI_FRAGMENT,
                 ]));
@@ -522,7 +532,8 @@ public function addAction(Request $request): Response
             }
         }
 
-        return $this->redirect($this->generateUrl('_ezpublishLocation', [
+        return $this->redirect($this->generateUrl('_ez_content_view', [
+            'contentId' => $contentInfo->id,
             'locationId' => $contentInfo->mainLocationId,
             '_fragment' => LocationsTab::URI_FRAGMENT,
         ]));
@@ -610,19 +621,23 @@ public function updateAction(Request $request): Response
                     'location'
                 );
 
-                return new RedirectResponse($this->generateUrl('_ezpublishLocation', [
-                        'locationId' => $location->getContentInfo()->mainLocationId,
-                        '_fragment' => DetailsTab::URI_FRAGMENT,
-                    ]));
+                return new RedirectResponse($this->generateUrl('_ez_content_view', [
+                    'contentId' => $location->contentId,
+                    'locationId' => $location->getContentInfo()->mainLocationId,
+                    '_fragment' => DetailsTab::URI_FRAGMENT,
+                ]));
             });
 
             if ($result instanceof Response) {
                 return $result;
             }
         }
 
-        return $this->redirect($this->generateUrl('_ezpublishLocation', [
-            'locationId' => $location->getContentInfo()->mainLocationId,
+        $contentInfo = $location->getContentInfo();
+
+        return $this->redirect($this->generateUrl('_ez_content_view', [
+            'contentId' => $contentInfo->id,
+            'locationId' => $contentInfo->mainLocationId,
             '_fragment' => DetailsTab::URI_FRAGMENT,
         ]));
     }

diff --git a/src/bundle/Controller/ObjectStateController.php b/src/bundle/Controller/ObjectStateController.php
@@ -350,7 +350,8 @@ public function updateContentStateAction(
             }
         }
 
-        return $this->redirectToRoute('_ezpublishLocation', [
+        return $this->redirectToRoute('_ez_content_view', [
+            'contentId' => $contentInfo->id,
             'locationId' => $contentInfo->mainLocationId,
             '_fragment' => 'ez-tab-location-view-details',
         ]);

diff --git a/src/bundle/Controller/TranslationController.php b/src/bundle/Controller/TranslationController.php
@@ -90,7 +90,10 @@ public function addAction(Request $request): Response
         }
 
         $redirectionUrl = null !== $location
-            ? $this->generateUrl('_ezpublishLocation', ['locationId' => $location->id])
+            ? $this->generateUrl('_ez_content_view', [
+                'contentId' => $location->contentId,
+                'locationId' => $location->id,
+            ])
             : $this->generateUrl('ezplatform.dashboard');
 
         return $this->redirect($redirectionUrl);
@@ -127,7 +130,8 @@ public function removeAction(Request $request): Response
                     );
                 }
 
-                return new RedirectResponse($this->generateUrl('_ezpublishLocation', [
+                return new RedirectResponse($this->generateUrl('_ez_content_view', [
+                    'contentId' => $contentInfo->id,
                     'locationId' => $contentInfo->mainLocationId,
                     '_fragment' => TranslationsTab::URI_FRAGMENT,
                 ]));
@@ -138,7 +142,8 @@ public function removeAction(Request $request): Response
             }
         }
 
-        return $this->redirect($this->generateUrl('_ezpublishLocation', [
+        return $this->redirect($this->generateUrl('_ez_content_view', [
+            'contentId' => $contentInfo->id,
             'locationId' => $contentInfo->mainLocationId,
             '_fragment' => TranslationsTab::URI_FRAGMENT,
         ]));

diff --git a/src/bundle/Controller/User/UserDeleteController.php b/src/bundle/Controller/User/UserDeleteController.php
@@ -91,7 +91,8 @@ public function userDeleteAction(Request $request): Response
                     'content'
                 );
 
-                return new RedirectResponse($this->generateUrl('_ezpublishLocation', [
+                return new RedirectResponse($this->generateUrl('_ez_content_view', [
+                    'contentId' => $location->contentId,
                     'locationId' => $location->parentLocationId,
                 ]));
             });

diff --git a/src/bundle/Controller/VersionController.php b/src/bundle/Controller/VersionController.php
@@ -109,7 +109,8 @@ public function removeAction(Request $request): Response
                     'version'
                 );
 
-                return new RedirectResponse($this->generateUrl('_ezpublishLocation', [
+                return new RedirectResponse($this->generateUrl('_ez_content_view', [
+                    'contentId' => $contentInfo->id,
                     'locationId' => $contentInfo->mainLocationId,
                     '_fragment' => VersionsTab::URI_FRAGMENT,
                 ]));
@@ -120,7 +121,8 @@ public function removeAction(Request $request): Response
             }
         }
 
-        return $this->redirect($this->generateUrl('_ezpublishLocation', [
+        return $this->redirect($this->generateUrl('_ez_content_view', [
+            'contentId' => $contentInfo->id,
             'locationId' => $contentInfo->mainLocationId,
             '_fragment' => VersionsTab::URI_FRAGMENT,
         ]));

diff --git a/src/bundle/Resources/config/routing.yaml b/src/bundle/Resources/config/routing.yaml
@@ -1,17 +1,3 @@
-#
-# System routes
-#
-
-_ezpublishLocation:
-    path: /content/location/{locationId}/{languageCode}/{viewType}/{layout}
-    options:
-        expose: true
-    defaults:
-        _controller: ez_content:viewLocation
-        viewType: full
-        layout: true
-        languageCode: null
-
 #
 # Dashboard
 #

diff --git a/src/bundle/Resources/public/js/scripts/admin.location.view.js b/src/bundle/Resources/public/js/scripts/admin.location.view.js
@@ -78,7 +78,7 @@
             })
             .catch(eZ.helpers.notification.showErrorNotification);
     };
-    const generateLink = (locationId) => Routing.generate('_ezpublishLocation', { locationId });
+    const generateLink = (contentId, locationId) => Routing.generate('_ez_content_view', { contentId, locationId });
     const setModalTableTitle = (title) => {
         const modalTableTitleNode = doc.querySelector(`${SELECTOR_MODAL_BULK_ACTION_FAIL} .ez-table-header__headline`);
 

diff --git a/src/bundle/Resources/public/js/scripts/cotf/create.js b/src/bundle/Resources/public/js/scripts/cotf/create.js
@@ -5,7 +5,7 @@
     const onConfirm = (items) => {
         closeUDW();
 
-        global.location.href = Routing.generate('_ezpublishLocation', { locationId: items[0].id });
+        global.location.href = Routing.generate('_ez_content_view', { contentId: items[0].contentId, locationId: items[0].id });
     };
     const onCancel = () => closeUDW();
     const openUDW = (event) => {

diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezimageasset.js b/src/bundle/Resources/public/js/scripts/fieldType/ezimageasset.js
@@ -120,7 +120,8 @@
             const previewAlt = preview.querySelector('.ez-field-edit-preview__image-alt input');
             const previewActionPreview = preview.querySelector('.ez-field-edit-preview__action--preview');
             const assetNameContainer = preview.querySelector('.ez-field-edit-preview__asset-name a');
-            const destinationLocationUrl = Routing.generate('_ezpublishLocation', {
+            const destinationLocationUrl = Routing.generate('_ez_content_view', {
+                contentId: destinationContentId,
                 locationId: destinationLocationId,
             });
 

diff --git a/src/bundle/Resources/public/js/scripts/udw/browse.js b/src/bundle/Resources/public/js/scripts/udw/browse.js
@@ -5,7 +5,7 @@
     const onConfirm = (items) => {
         closeUDW();
 
-        global.location.href = Routing.generate('_ezpublishLocation', { locationId: items[0].id });
+        global.location.href = Routing.generate('_ez_content_view', { contentId: items[0].contentId, locationId: items[0].id });
     };
     const onCancel = () => closeUDW();
     const openUDW = (event) => {

diff --git a/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig b/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig
@@ -54,13 +54,13 @@
                                             <use xlink:href="{{ ez_content_type_icon(bookmark.contentType.identifier) }}"></use>
                                         </svg>
                                     </td>
-                                    <td class="ez-table__cell ez-table__cell--after-icon"><a href="{{ path('_ezpublishLocation', { 'locationId': bookmark.id }) }}">{{ ez_content_name(bookmark.contentInfo) }}</a></td>
+                                    <td class="ez-table__cell ez-table__cell--after-icon"><a href="{{ path('_ez_content_view', { 'contentId': bookmark.contentInfo.id, 'locationId': bookmark.id }) }}">{{ ez_content_name(bookmark.contentInfo) }}</a></td>
                                     <td class="ez-table__cell">{{ bookmark.contentType.name }}</td>
                                     <td class="ez-table__cell">
                                         {% if bookmark.pathLocations|length > 1 %}
                                             {% for location in bookmark.pathLocations %}
                                                 {% if loop.revindex > 1 %}
-                                                    <a href="{{ path('_ezpublishLocation', {'locationId': location.id}) }}">
+                                                    <a href="{{ path('_ez_content_view', { 'contentId': location.contentId, 'locationId': location.id}) }}">
                                                         {{ ez_content_name(location.contentInfo) }}
                                                     </a>
                                                     {% if loop.revindex > 2 %}/{% endif %}

diff --git a/src/bundle/Resources/views/themes/admin/content/create/create.html.twig b/src/bundle/Resources/views/themes/admin/content/create/create.html.twig
@@ -54,7 +54,7 @@
 {% endblock %}
 
 {% block close_button %}
-    <a class="ez-content-edit-container__close" href="{{ path('_ezpublishLocation', {'locationId': parent_location.id}) }}"></a>
+    <a class="ez-content-edit-container__close" href="{{ path('_ez_content_view', { 'contentId': parent_location.contentId, 'locationId': parent_location.id}) }}"></a>
 {% endblock %}
 
 {% block form_before %}

diff --git a/src/bundle/Resources/views/themes/admin/content/edit/edit.html.twig b/src/bundle/Resources/views/themes/admin/content/edit/edit.html.twig
@@ -63,7 +63,7 @@
 
 {% block close_button %}
     {% set referrer_location = is_published ? location : parent_location %}
-    <a class="ez-content-edit-container__close" href="{{ path('_ezpublishLocation', {'locationId': referrer_location.id }) }}"></a>
+    <a class="ez-content-edit-container__close" href="{{ path('_ez_content_view', { 'contentId': referrer_location.contentId, 'locationId': referrer_location.id }) }}"></a>
 {% endblock %}
 
 {% block form_before %}

diff --git a/src/bundle/Resources/views/themes/admin/content/location_view.html.twig b/src/bundle/Resources/views/themes/admin/content/location_view.html.twig
@@ -36,7 +36,10 @@
                             {% if not loop.last %}
                                 {% set items = items|merge([{
                                     'value': ez_content_name(path_location.contentInfo),
-                                    'url': path('_ezpublishLocation', {'locationId': path_location.id})
+                                    'url': path('_ez_content_view', {
+                                        'contentId': path_location.contentId,
+                                        'locationId': path_location.id
+                                    })
                                 }]) %}
                             {% endif %}
                         {% endfor %}

diff --git a/src/bundle/Resources/views/themes/admin/content/relation.html.twig b/src/bundle/Resources/views/themes/admin/content/relation.html.twig
@@ -1,6 +1,6 @@
 <td>
     <a {% if not content.contentInfo.trashed %}
-        href="{{ path('_ezpublishLocation', { 'locationId': content.contentInfo.mainLocationId } ) }}"
+        href="{{ path('_ez_content_view', { 'contentId': content.id, 'locationId': content.contentInfo.mainLocationId } ) }}"
     {% endif %}>
         {{ content.getName() }}
         {% if content.contentInfo.trashed %}

diff --git a/src/bundle/Resources/views/themes/admin/content/tab/content.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/content.html.twig
@@ -7,7 +7,7 @@
     <form class="form-inline ez-content-preview-collapse collapse show">
         <select class="form-control ez-location-language-change">
             {% for language in languages %}
-                <option value="{{ path('_ezpublishLocation', {'locationId': location.id, 'languageCode': language.languageCode}) }}"
+                <option value="{{ path('_ez_content_view', { 'contentId': location.contentId, 'locationId': location.id, 'languageCode': language.languageCode}) }}"
                     {% if current_language == language.languageCode %} selected="selected" {% endif %}
                 >{{ language.name }}</option>
             {% endfor %}