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

CC-5725: Changing a show's repeat type removes first instance from repeating series

This commit is contained in:
drigato 2014-03-06 11:18:13 -05:00
parent 51b5cc2052
commit 35fd639c1c
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1545,15 +1545,23 @@ SQL;
if (is_null($endDate) || $startDateTimeClone->getTimestamp() <= $endDateTime->getTimestamp()) { if (is_null($endDate) || $startDateTimeClone->getTimestamp() <= $endDateTime->getTimestamp()) {
if ($this->isUpdate) { if ($this->isUpdate) {
$showDay = CcShowDaysQuery::create() if ($this->repeatType >= 0) {
->filterByDbShowId($showId) $showDay = CcShowDaysQuery::create()
->filterByDbRepeatType($this->origCcShowDay->getDbRepeatType()) ->filterByDbShowId($showId)
->filterByDbDay($this->origCcShowDay->getDbDay()) ->filterByDbRepeatType($this->repeatType)
->findOne(); ->filterByDbDay($day)
if (!$showDay) { ->findOne();
//if no show day object was found it is because a new if (!$showDay) {
//repeating day of the week was added //if no show day object was found it is because a new
$showDay = new CcShowDays(); //repeating day of the week was added
$showDay = new CcShowDays();
}
} else {
$showDay = CcShowDaysQuery::create()
->filterByDbShowId($showId)
->filterByDbRepeatType($this->origCcShowDay->getDbRepeatType())
->filterByDbDay($this->origCcShowDay->getDbDay())
->findOne();
} }
} else { } else {
$showDay = new CcShowDays(); $showDay = new CcShowDays();