gitmedia/sterntours
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* #1329 (Versuch der Behebung)

Browse source 
* #1332
* #1333
* #1334

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3336 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
uli 2017-04-28 05:34:46 +00:00
parent 54268ba706
commit 93230c53f7
5 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/app/Resources/views/default/components/footer.html.twig
View file

@ -116,7 +116,7 @@
<div class="link-footer"> <div class="link-footer">
<a href="/impressum" title="Impressum">Impressum</a> | <a href="/impressum" title="Impressum">Impressum</a> |
<a href="/agb" title="AGB">AGB</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="/datenschutz" title="Datenschutz">Datenschutz</a> |
<a href="/bildnachweis" title="Bildnachweise">Bildnachweise</a> | <a href="/bildnachweis" title="Bildnachweise">Bildnachweise</a> |
<a href="/sitemap" title="Sitemap">Sitemap</a> <a href="/sitemap" title="Sitemap">Sitemap</a>

2
trunk/app/Resources/views/default/pages/ttSearch.html.twig
View file

@ -15,7 +15,7 @@ TODO: This doesn't work. Form labels are rendered, but widgets themselves not. S
{% block body %} {% block body %}
{% if tt_url is defined %} {% 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);" onload="window.parent.parent.scrollTo(0,0);"
></iframe> ></iframe>
{% else %} {% else %}

2
trunk/src/AppBundle/Controller/DefaultController.php
View file

@ -37,7 +37,7 @@ class DefaultController extends Controller
{ {
return $this->render('default/pages/home.html.twig', [ return $this->render('default/pages/home.html.twig', [
'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR, 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
'canonical_url' => Util::getBaseUrl() .'/', 'canonical_url' => Util::getBaseUrl(),
'show_search_sidebar_widget' => false, 'show_search_sidebar_widget' => false,
'show_offers_sidebar_widget' => false, 'show_offers_sidebar_widget' => false,
'search_form' => $this->createForm(SearchRequestType::class)->createView(), 'search_form' => $this->createForm(SearchRequestType::class)->createView(),

7
trunk/src/AppBundle/Entity/TravelPeriodRepository.php
View file

@ -169,7 +169,7 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
} }
} }
foreach ($travelPrograms as $travelProgram) foreach ($travelPrograms as $k => $travelProgram)
{ {
$flightPeriod = null; $flightPeriod = null;
if (!$travelProgram->getIsMediated()) if (!$travelProgram->getIsMediated())
@ -185,6 +185,11 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
$this->addTravelDatesToProgram($travelProgram, $travelProgram->getPeriods(), $flightPeriods, $this->addTravelDatesToProgram($travelProgram, $travelProgram->getPeriods(), $flightPeriods,
$startDate, $endDate); $startDate, $endDate);
if (!$travelProgram->hasTravelDates())
{
unset($travelPrograms[$k]);
}
} }
return $travelPrograms; return $travelPrograms;

5
trunk/src/AppBundle/Entity/TravelProgram.php
View file

@ -1472,6 +1472,11 @@ class TravelProgram
return $this->travelDateByKey; return $this->travelDateByKey;
} }
public function hasTravelDates()
{
return !empty($this->travelDateByKey);
}
public function getIsPossibleStartDate(\DateTime $startDate) public function getIsPossibleStartDate(\DateTime $startDate)
{ {
return $this->getIsAvailWeekday(intval($startDate->format('w'))); return $this->getIsAvailWeekday(intval($startDate->format('w')));