Sync with ezdemo content

lserwatka · Nov 19, 2012 · dbb13a2 · dbb13a2
1 parent 0c1a560
commit dbb13a2
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 4 deletions.
diff --git a/src/EzSystems/DemoBundle/Controller/DemoController.php b/src/EzSystems/DemoBundle/Controller/DemoController.php
@@ -15,6 +15,7 @@
 use eZ\Publish\API\Repository\Values\Content\Query\SortClause;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use eZ\Publish\API\Repository\Values\Content\Search\SearchResult;
 use \DateTime;
 
 class DemoController extends Controller
@@ -46,19 +47,61 @@ public function testWithLegacyAction( $contentId )
      * Renders the top menu, with cache control
      *
      * @param int $locationId
+     * @param array $excludeContentTypes
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function topMenuAction( $locationId )
+    public function topMenuAction( $locationId, array $excludeContentTypes = array() )
     {
         $response = new Response;
         $response->setPublic();
         $response->setMaxAge( 60 );
         $location = $this->getRepository()->getLocationService()->loadLocation( $locationId );
 
+        $excludeCriterion = array();
+        if ( !empty( $excludeContentTypes ) )
+        {
+            foreach( $excludeContentTypes as $contentTypeIdentifier )
+            {
+                $contentType = $this->getRepository()->getContentTypeService()->loadContentTypeByIdentifier( $contentTypeIdentifier );
+                $excludeCriterion[] = new Criterion\LogicalNot(
+                    new Criterion\ContentTypeId( $contentType->id )
+                );
+            }
+        }
+        $criteria = array(
+                new Criterion\Subtree( $location->pathString ),
+                new Criterion\ParentLocationId( $locationId )
+        );
+
+        if ( !empty( $excludeCriterion ) )
+            $criteria[] = new Criterion\LogicalAnd( $excludeCriterion );
+
+        $query = new Query(
+            array(
+                'criterion' => new Criterion\LogicalAnd(
+                    $criteria
+                ),
+                'sortClauses' => array(
+                    new SortClause\DatePublished( Query::SORT_DESC )
+                )
+            )
+        );
+
+        $searchResult = $this->getRepository()->getSearchService()->findContent( $query );
+
+        $locationList = array();
+        if ( $searchResult instanceof SearchResult )
+        {
+            foreach ( $searchResult->searchHits as $searchHit )
+            {
+                $locationList[] = $this->getRepository()->getLocationService()->loadLocation( $searchHit->valueObject->contentInfo->mainLocationId );
+            }
+        }
+
         return $this->render(
             "eZDemoBundle::page_topmenu.html.twig",
             array(
-                "locationList" => $this->getRepository()->getLocationService()->loadLocationChildren( $location )
+                "locationList" => $locationList
             ),
             $response
         );

diff --git a/src/EzSystems/DemoBundle/Resources/views/page_topmenu.html.twig b/src/EzSystems/DemoBundle/Resources/views/page_topmenu.html.twig
@@ -5,7 +5,7 @@
 
         <div class="nav-collapse">
             <ul class="nav">
-                {% for location in locationList.locations %}
+                {% for location in locationList %}
                     {% if location.contentInfo.contentType.identifer == 'link' %}
                         <li id=""><a href="#">{{ location.contentInfo.name }}</a></li>
                     {% else %}

diff --git a/src/EzSystems/DemoBundle/Resources/views/pagelayout.html.twig b/src/EzSystems/DemoBundle/Resources/views/pagelayout.html.twig
@@ -23,7 +23,7 @@
     <div class="navbar main-navi">
         <!-- Top menu area: START -->
         {% block topMenu %}
-            {% render "eZDemoBundle:Demo:topMenu" with {'locationId': 2}, {'standalone': true} %}
+            {% render "eZDemoBundle:Demo:topMenu" with {'locationId': 2, 'excludeContentTypes': [ 'article' ]}, {'standalone': true} %}
         {% endblock %}
         <!-- Top menu area: END -->
         {# TODO: implement logic to control path visibility #}