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

SAAS-924: Cannot edit repeating show if first instance has ended

Browse source 
Added safeguard in case we don't find a future show instance
This commit is contained in:
drigato 2015-07-13 09:04:49 -04:00
parent 1b3a9f6e6a
commit 721cd5a31b
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/services/ShowFormService.php
View file

@ -158,7 +158,11 @@ class Application_Service_ShowFormService
if (!$ccShowDay->isRepeating()) { if (!$ccShowDay->isRepeating()) {
$form->disableStartDateAndTime(); $form->disableStartDateAndTime();
} else { } else {
list($showStart, $showEnd) = $this->getNextFutureRepeatShowTime(); $showStartAndEnd = $this->getNextFutureRepeatShowTime();
if (!is_null($showStartAndEnd)) {
$showStart = $showStartAndEnd["starts"];
$showEnd = $showStartAndEnd["ends"];
}
if ($this->hasShowStarted($showStart)) { if ($this->hasShowStarted($showStart)) {
$form->disableStartDateAndTime(); $form->disableStartDateAndTime();
} }
@ -198,7 +202,7 @@ class Application_Service_ShowFormService
$starts->setTimezone(new DateTimeZone($showTimezone)); $starts->setTimezone(new DateTimeZone($showTimezone));
$ends->setTimezone(new DateTimeZone($showTimezone)); $ends->setTimezone(new DateTimeZone($showTimezone));
return array($starts, $ends); return array("starts" => $starts, "ends" => $ends);
} }
private function populateInstanceFormWhen($form) private function populateInstanceFormWhen($form)