Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x

This commit is contained in:
Naomi 2014-03-10 18:33:15 -04:00
parent 8d2926aeed 725b5da154
commit c668d91e08
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
airtime_mvc/application/services/ShowService.php
View File

@ -463,6 +463,10 @@ SQL;
if ($showData['add_show_repeats'] != $currentShowDay->isRepeating()) { if ($showData['add_show_repeats'] != $currentShowDay->isRepeating()) {
$this->deleteAllRepeatInstances($currentShowDay, $showId); $this->deleteAllRepeatInstances($currentShowDay, $showId);
if (!$showData["add_show_repeats"]) {
$this->deleteAllShowDays($showId);
}
//if repeat option was checked we need to treat the current show day //if repeat option was checked we need to treat the current show day
//as a new show day so the repeat instances get created properly //as a new show day so the repeat instances get created properly
//in createWeeklyRepeatInstances() //in createWeeklyRepeatInstances()
@ -1573,6 +1577,7 @@ SQL;
$keepDay = $day; $keepDay = $day;
$day = $this->origCcShowDay->getDbDay(); $day = $this->origCcShowDay->getDbDay();
} }
$showDay = CcShowDaysQuery::create() $showDay = CcShowDaysQuery::create()
->filterByDbShowId($showId) ->filterByDbShowId($showId)
->filterByDbRepeatType($this->origCcShowDay->getDbRepeatType()) ->filterByDbRepeatType($this->origCcShowDay->getDbRepeatType())