* Behoben: Angebotsboxen und -Karussells enthalten deaktivierte Reisen

* Sitemap

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3305 f459cee4-fb09-11de-96c3-f9c5f16c3c76

trunk/app/Resources/views/default/components/sitemap/sitemapNode.html.twig

@@ -0,0 +1,18 @@
+<ul>
+    {% for page_node in page_nodes %}
+
+        {% set default_url = base_url|default('') ~ '/' ~ page_node.slug %}
+
+        <li style="padding-left: 10px;">
+            <a href="{{ page_node.realUrlPath|default( default_url ) }}">
+                {{ page_node.title }}
+            </a>
+            {% if page_node.__children is not empty %}
+                {% include 'default/components/sitemap/sitemapNode.html.twig' with {
+                    page_nodes: page_node.__children,
+                    base_url: default_url,
+                } %}
+            {% endif %}
+        </li>
+    {% endfor %}
+</ul>

trunk/app/Resources/views/default/pages/sitemap.html.twig

@@ -0,0 +1,5 @@
+{% extends get_base_template() %}
+
+{% block body %}
+    {% include 'default/components/sitemap/sitemapNode.html.twig' %}
+{% endblock body %}

trunk/src/AppBundle/Controller/DefaultController.php

@@ -214,13 +214,22 @@ class DefaultController extends Controller
             ->getQuery()
             ->execute()
         ;
-        //$rootNodes[0]->
+        /** @var Page[] $pageNodes Actually no entity objects but associative arrays representing page entities */
-        /** @var Page $node */
+        $pageNodes = [];
         foreach ($rootNodes as $rootNode)
         {
-            // #TODO
+            $pageNodes[] = $repo->buildTree($repo->getNodesHierarchyQueryBuilder($rootNode, false, [], true)
-            $repo->childrenHierarchy($rootNode);
+                ->leftJoin('node.travelProgram', 'tp')
+                ->andWhere('(tp.id IS NULL OR tp.status = 1)')
+                ->andWhere('node.status = 1')
+                ->getQuery()
+                ->getArrayResult()
+            )[0];
         }
+        return $this->render('default/pages/sitemap.html.twig', [
+            'breadcrumb_entries' => [new BreadcrumbEntry('Sitemap')],
+            'page_nodes' => $pageNodes
+        ]);
     }
 
     /*

trunk/src/AppBundle/Entity/PageRepository.php

@@ -49,6 +49,8 @@ class PageRepository extends NestedTreeRepository
             ->innerJoin('node.travelProgram', 'tp')
             ->innerJoin('tp.countries', 'c')
             ->where('c.id = '. $country->getId())
+            ->andWhere('node.status = 1')
+            ->andWhere('tp.status = 1')
             ->getQuery()
             ->execute()
             ;
@@ -68,8 +70,8 @@ class PageRepository extends NestedTreeRepository
                 ->addSelect('tp')
                 ->innerJoin('tp.countries', 'c')
                 ->where('c.id = '. $country->getId())
-                ->andWhere('node.status > 0')
+                ->andWhere('node.status = 1')
-                ->andWhere('tp.status > 0')
+                ->andWhere('tp.status = 1')
                 ->orderBy('node.order')
                 ->addOrderBy('tp.position')
                 ->addOrderBy('node.title')