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

CC-4961: Show linking

Browse source 
Removed unused schedule controller actions
Fix bug where changing a show to repeat deletes the original show's content
This commit is contained in:
denise 2013-03-19 10:09:28 -04:00
parent 4bdd89f747
commit bae9f1202a
2 changed files with 13 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

14
airtime_mvc/application/services/ShowInstanceService.php
View file

@ -372,11 +372,6 @@ SQL;
$this->deleteAllRepeatInstances($currentShowDay, $showId);
}
//duration has changed
/*if ($showData['add_show_duration'] != $currentShowDay->getDbDuration()) {
$this->updateInstanceDuration($showData);
}*/
if ($showData['add_show_repeats']) {
$localShowStart = $currentShowDay->getLocalStartDateAndTime();
@ -395,7 +390,10 @@ SQL;
$this->deleteAllInstances($showId);
}
if ($repeatType != $currentShowDay->getDbRepeatType()) {
$currentRepeatType = $currentShowDay->getDbRepeatType();
//only delete instances if the show being edited was already repeating
//and the repeat type changed
if ($currentRepeatType != -1 && $repeatType != $currentRepeatType) {
//repeat type changed
$this->deleteAllInstances($showId);
} else {
@ -513,12 +511,12 @@ DELETE
FROM cc_show_instances
WHERE starts > :timestamp::TIMESTAMP
AND show_id = :showId
AND date(starts) != :firstShow
AND starts != :firstShow
SQL;
Application_Common_Database::prepareAndExecute( $sql,
array( ':timestamp' => gmdate("Y-m-d H:i:s"),
':showId' => $showId,
':firstShow' => $firstShow->format("Y-m-d")), 'execute');
':firstShow' => $firstShow->format("Y-m-d H:i:s")), 'execute');
}
public function deleteAllInstances($showId)