EZP-32395: Sort out Locations tab info on visibility (#1725)

* EZP-32395: Sort out Locations tab info on visibility * EZP-32395: BC remark Co-authored-by: Bartek Wajda <bartlomiej.wajda@ibexa.co>
ezsystems · Mar 26, 2021 · e1c20e3 · e1c20e3
1 parent 3e6a29e
commit e1c20e3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/src/bundle/Controller/ContentViewController.php b/src/bundle/Controller/ContentViewController.php
@@ -168,7 +168,6 @@ public function locationViewAction(Request $request, ContentView $view): Content
             $this->supplyPathLocations($view);
             $this->subitemsContentViewParameterSupplier->supply($view);
             $this->supplyContentActionForms($view);
-            $this->supplyIsLocationInvisible($view);
             $this->supplyContentReverseRelations($view);
             $this->supplyContentTreeParameters($view);
         }
@@ -567,22 +566,4 @@ function (Repository $repository) use ($contentInfo) {
 
         $view->addParameters(['content_has_reverse_relations' => \count($relations) > 0]);
     }
-
-    /**
-     * @param \eZ\Publish\Core\MVC\Symfony\View\ContentView $view
-     */
-    private function supplyIsLocationInvisible(ContentView $view)
-    {
-        $location = $view->getLocation();
-        $parentLocation = $this->permissionResolver->sudo(
-            function (Repository $repository) use ($location) {
-                return $repository->getLocationService()->loadLocation($location->parentLocationId);
-            },
-            $this->repository
-        );
-        $isLocationVisible = !($parentLocation->hidden || $parentLocation->invisible);
-
-        // Location is invisible when parent location is not visible.
-        $view->addParameters(['is_location_visible' => $isLocationVisible]);
-    }
 }
diff --git a/src/bundle/Resources/views/content/locationview.html.twig b/src/bundle/Resources/views/content/locationview.html.twig
@@ -63,6 +63,7 @@
                 </div>
                 <div class="panel panel-primary">
                     <div class="panel-body">
+                        {# 'is_location_visible': location.invisible - param deprecated since EZP-32395 #}
                         {{ ez_platform_tabs('location-view', {
                             'content': content,
                             'location': location,
@@ -73,7 +74,7 @@
                             'system_urls_pagination_params': system_urls_pagination_params,
                             'roles_pagination_params': roles_pagination_params,
                             'policies_pagination_params': policies_pagination_params,
-                            'is_location_visible': is_location_visible,
+                            'is_location_visible': location.invisible,
                         }, '@ezdesign/parts/tab/locationview.html.twig') }}
 
                         {% if contentType.isContainer %}

diff --git a/src/bundle/Resources/views/content/tab/locations/tab.html.twig b/src/bundle/Resources/views/content/tab/locations/tab.html.twig
@@ -51,7 +51,7 @@
                                     {% if not can_hide[location.id] %} disabled="disabled"{% endif %}
                                     value="{{ location.id }}"/>
                             </label>
-                            {% if location.contentInfo.isHidden or not is_location_visible %}
+                            {% if location.invisible %}
                                 <span class="ml-2">
                                     {{ 'tab.locations.hidden_content_or_superior'|trans()|desc('Content or superior is hidden') }}
                                 </span>