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

CC-5240: Overnight Linked Shows, newly generated not getting content

This commit is contained in:
drigato 2013-06-19 01:17:32 -04:00
parent b95a0d7c4a
commit 28d73264da
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,9 +179,6 @@ class Application_Service_ShowService
if (is_null($this->ccShow)) { if (is_null($this->ccShow)) {
$ccShowDays = $this->getShowDaysInRange($populateUntil, $end); $ccShowDays = $this->getShowDaysInRange($populateUntil, $end);
if (count($ccShowDays) > 0) {
$this->ccShow = $ccShowDays[0]->getCcShow();
}
} else { } else {
$ccShowDays = $this->ccShow->getCcShowDays(); $ccShowDays = $this->ccShow->getCcShowDays();
} }
@ -190,7 +187,18 @@ class Application_Service_ShowService
$populateUntil = $end; $populateUntil = $end;
} }
/* In case the user is moving forward in the calendar and there are
* linked shows in the schedule we need to keep track of each cc_show
* so we know which shows need to be filled with content
*/
$ccShows = array();
foreach ($ccShowDays as $day) { foreach ($ccShowDays as $day) {
$this->ccShow = $day->getCcShow();
if (!isset($ccShows[$day->getDbShowId()])) {
$ccShows[$day->getDbShowId()] = $day->getccShow();
}
switch ($day->getDbRepeatType()) { switch ($day->getDbRepeatType()) {
case NO_REPEAT: case NO_REPEAT:
$this->createNonRepeatingInstance($day, $populateUntil); $this->createNonRepeatingInstance($day, $populateUntil);
@ -212,9 +220,10 @@ class Application_Service_ShowService
} }
} }
if (isset($this->ccShow) && ($this->isUpdate || $fillInstances) && foreach ($ccShows as $ccShow) {
$this->ccShow->isLinked()) { if (($this->isUpdate || $fillInstances) && $ccShow->isLinked()) {
Application_Service_SchedulerService::fillNewLinkedInstances($this->ccShow); Application_Service_SchedulerService::fillNewLinkedInstances($ccShow);
}
} }
if (isset($this->linkedShowContent)) { if (isset($this->linkedShowContent)) {
@ -1499,4 +1508,4 @@ SQL;
$repeatInfo->setDbNextPopDate($nextInfo[0]) $repeatInfo->setDbNextPopDate($nextInfo[0])
->save(); ->save();
} }
} }