From 93230c53f79a2850733174503e8ad0484482cd14 Mon Sep 17 00:00:00 2001
From: uli <uli@f459cee4-fb09-11de-96c3-f9c5f16c3c76>
Date: Fri, 28 Apr 2017 05:34:46 +0000
Subject: [PATCH] * #1329 (Versuch der Behebung) * #1332 * #1333 * #1334

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3336 f459cee4-fb09-11de-96c3-f9c5f16c3c76
---
 .../Resources/views/default/components/footer.html.twig    | 2 +-
 trunk/app/Resources/views/default/pages/ttSearch.html.twig | 2 +-
 trunk/src/AppBundle/Controller/DefaultController.php       | 2 +-
 trunk/src/AppBundle/Entity/TravelPeriodRepository.php      | 7 ++++++-
 trunk/src/AppBundle/Entity/TravelProgram.php               | 5 +++++
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/trunk/app/Resources/views/default/components/footer.html.twig b/trunk/app/Resources/views/default/components/footer.html.twig
index 37861c62..72beee2e 100644
--- a/trunk/app/Resources/views/default/components/footer.html.twig
+++ b/trunk/app/Resources/views/default/components/footer.html.twig
@@ -116,7 +116,7 @@
                 <div class="link-footer">
                     <a href="/impressum" title="Impressum">Impressum</a> |
                     <a href="/agb" title="AGB">AGB</a> |
-                    <a href="/arb" title="AGB">AGB</a> |
+                    <a href="/arb" title="ARB">ARB</a> |
                     <a href="/datenschutz" title="Datenschutz">Datenschutz</a> |
                     <a href="/bildnachweis" title="Bildnachweise">Bildnachweise</a> |
                     <a href="/sitemap" title="Sitemap">Sitemap</a>
diff --git a/trunk/app/Resources/views/default/pages/ttSearch.html.twig b/trunk/app/Resources/views/default/pages/ttSearch.html.twig
index 33a241b3..3ee6cf54 100644
--- a/trunk/app/Resources/views/default/pages/ttSearch.html.twig
+++ b/trunk/app/Resources/views/default/pages/ttSearch.html.twig
@@ -15,7 +15,7 @@ TODO: This doesn't work. Form labels are rendered, but widgets themselves not. S
 
 {% block body %}
     {% if tt_url is defined %}
-        <iframe src="{{ tt_url }}" scrolling="no" width="100%" height="13500"
+        <iframe src="{{ tt_url|raw }}" scrolling="no" width="100%" height="13500"
                 onload="window.parent.parent.scrollTo(0,0);"
         ></iframe>
     {% else %}
diff --git a/trunk/src/AppBundle/Controller/DefaultController.php b/trunk/src/AppBundle/Controller/DefaultController.php
index 250313f2..3a0fddfb 100644
--- a/trunk/src/AppBundle/Controller/DefaultController.php
+++ b/trunk/src/AppBundle/Controller/DefaultController.php
@@ -37,7 +37,7 @@ class DefaultController extends Controller
     {
         return $this->render('default/pages/home.html.twig', [
             'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
-            'canonical_url' => Util::getBaseUrl() .'/',
+            'canonical_url' => Util::getBaseUrl(),
             'show_search_sidebar_widget' => false,
             'show_offers_sidebar_widget' => false,
             'search_form' => $this->createForm(SearchRequestType::class)->createView(),
diff --git a/trunk/src/AppBundle/Entity/TravelPeriodRepository.php b/trunk/src/AppBundle/Entity/TravelPeriodRepository.php
index de53f1b1..c4d2315a 100644
--- a/trunk/src/AppBundle/Entity/TravelPeriodRepository.php
+++ b/trunk/src/AppBundle/Entity/TravelPeriodRepository.php
@@ -169,7 +169,7 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
             }
         }
 
-        foreach ($travelPrograms as $travelProgram)
+        foreach ($travelPrograms as $k => $travelProgram)
         {
             $flightPeriod = null;
             if (!$travelProgram->getIsMediated())
@@ -185,6 +185,11 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
 
             $this->addTravelDatesToProgram($travelProgram, $travelProgram->getPeriods(), $flightPeriods,
               $startDate, $endDate);
+
+            if (!$travelProgram->hasTravelDates())
+            {
+                unset($travelPrograms[$k]);
+            }
         }
 
         return $travelPrograms;
diff --git a/trunk/src/AppBundle/Entity/TravelProgram.php b/trunk/src/AppBundle/Entity/TravelProgram.php
index 67dd3301..3a826752 100644
--- a/trunk/src/AppBundle/Entity/TravelProgram.php
+++ b/trunk/src/AppBundle/Entity/TravelProgram.php
@@ -1472,6 +1472,11 @@ class TravelProgram
         return $this->travelDateByKey;
     }
 
+    public function hasTravelDates()
+    {
+        return !empty($this->travelDateByKey);
+    }
+
     public function getIsPossibleStartDate(\DateTime $startDate)
     {
         return $this->getIsAvailWeekday(intval($startDate->format('w')));