CC-4382: Editing the color of a repeating show gives error message
-fixed
This commit is contained in:
parent
dd68f6d945
commit
54d18b7bcd
|
@ -202,7 +202,20 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
|
||||||
$repeatShowEnd->add(new DateInterval("P".$daysAdd."D"));
|
$repeatShowEnd->add(new DateInterval("P".$daysAdd."D"));
|
||||||
}
|
}
|
||||||
while ($repeatShowStart->getTimestamp() < $populateUntilDateTime->getTimestamp()) {
|
while ($repeatShowStart->getTimestamp() < $populateUntilDateTime->getTimestamp()) {
|
||||||
$overlapping = Application_Model_Schedule::checkOverlappingShows($repeatShowStart, $repeatShowEnd, $update, $instanceId);
|
//need to get each repeating show's instance id
|
||||||
|
$qry = CcShowInstancesQuery::create()
|
||||||
|
->filterByDbStarts($repeatShowStart->format('Y-m-d H:i:s'))
|
||||||
|
->filterByDbEnds($repeatShowEnd->format('Y-m-d H:i:s'))
|
||||||
|
->find();
|
||||||
|
$count = $qry->count();
|
||||||
|
if ($count > 1) {
|
||||||
|
$overlapping = true;
|
||||||
|
} elseif ($count == 1) {
|
||||||
|
$instanceId = $qry->getFirst()->getDbId();
|
||||||
|
$overlapping = Application_Model_Schedule::checkOverlappingShows($repeatShowStart, $repeatShowEnd, $update, $instanceId);
|
||||||
|
} else {
|
||||||
|
$overlapping = false;
|
||||||
|
}
|
||||||
if ($overlapping) {
|
if ($overlapping) {
|
||||||
$valid = false;
|
$valid = false;
|
||||||
$this->getElement('add_show_duration')->setErrors(array('Cannot schedule overlapping shows'));
|
$this->getElement('add_show_duration')->setErrors(array('Cannot schedule overlapping shows'));
|
||||||
|
|
Loading…
Reference in New Issue