CC-4651: Apache log errors part 1
-fixed -saas doesn't have rebroadcast shows so we don't need to check if they overlap
This commit is contained in:
parent
9cd389d16b
commit
3b58ee1f48
|
@ -227,22 +227,9 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
|
||||||
//this is a new show
|
//this is a new show
|
||||||
$overlapping = Application_Model_Schedule::checkOverlappingShows(
|
$overlapping = Application_Model_Schedule::checkOverlappingShows(
|
||||||
$repeatShowStart, $repeatShowEnd);
|
$repeatShowStart, $repeatShowEnd);
|
||||||
|
|
||||||
/* If the repeating show is rebroadcasted we need to check
|
|
||||||
* the rebroadcast dates relative to the repeating show
|
|
||||||
*/
|
|
||||||
if (!$overlapping && $formData['add_show_rebroadcast']) {
|
|
||||||
$overlapping = self::checkRebroadcastDates(
|
|
||||||
$repeatShowStart, $formData, $hours, $minutes);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
$overlapping = Application_Model_Schedule::checkOverlappingShows(
|
$overlapping = Application_Model_Schedule::checkOverlappingShows(
|
||||||
$repeatShowStart, $repeatShowEnd, $update, null, $formData["add_show_id"]);
|
$repeatShowStart, $repeatShowEnd, $update, null, $formData["add_show_id"]);
|
||||||
|
|
||||||
if (!$overlapping && $formData['add_show_rebroadcast']) {
|
|
||||||
$overlapping = self::checkRebroadcastDates(
|
|
||||||
$repeatShowStart, $formData, $hours, $minutes, true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($overlapping) {
|
if ($overlapping) {
|
||||||
|
|
Loading…
Reference in New Issue