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

Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas

Browse source
This commit is contained in:
Martin Konecny 2012-11-06 16:03:14 -05:00
commit a6bab19e59
1 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
airtime_mvc/application/forms/AddShowWhen.php
View file

@ -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) {