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

CC-4069: Edit Show -> cannot edit show

Browse source 
-fixed
This commit is contained in:
denise 2012-07-04 18:58:22 -04:00
parent cbf026412c
commit 1fa3da5bd0
3 changed files with 23 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,7 +83,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
}
public function checkReliantFields($formData, $validateStartDate, $originalStartDate=null) {
public function checkReliantFields($formData, $validateStartDate, $originalStartDate=null, $update=false, $instanceId=null) {
$valid = true;
$start_time = $formData['add_show_start_date']." ".$formData['add_show_start_time'];
@ -144,8 +144,11 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
*/
if ($valid) {
$show_start = new DateTime($start_time);
$show_start->setTimezone(new DateTimeZone('UTC'));
$show_end = new DateTime($end_time);
$overlapping = Application_Model_Schedule::checkOverlappingShows($show_start, $show_end);
$show_end->setTimezone(new DateTimeZone('UTC'));
$overlapping = Application_Model_Schedule::checkOverlappingShows($show_start, $show_end, $update, $instanceId);
if ($overlapping) {
$this->getElement('add_show_duration')->setErrors(array('Cannot have overlapping shows'));
$valid = false;