Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 

Refactored cc_show_day->getLocalEndDateAndTime() function
This commit is contained in:
drigato 2013-12-04 14:17:19 -05:00
parent 463d286ac5
commit 7f8f084c98
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
airtime_mvc/application/models/airtime/CcShowDays.php
View File

@ -40,8 +40,7 @@ class CcShowDays extends BaseCcShowDays {
);
//set timezone to that of the show
$dt->setTimezone(new DateTimeZone($this->getDbTimezone()));
//$dt->setTimezone(new DateTimeZone($this->getDbTimezone()));
return $dt;
}
@ -50,9 +49,9 @@ class CcShowDays extends BaseCcShowDays {
* Returns the end of a show in the timezone it was created in
* @param DateTime $startDateTime first show in show's local time
*/
public function getLocalEndDateAndTime($showStart)
public function getLocalEndDateAndTime()
{
$startDateTime = clone $showStart;
$startDateTime = $this->getLocalStartDateAndTime();
$duration = explode(":", $this->getDbDuration());
return $startDateTime->add(new DateInterval('PT'.$duration[0].'H'.$duration[1].'M'));

2
airtime_mvc/application/services/ShowFormService.php
View File

@ -131,7 +131,7 @@ class Application_Service_ShowFormService
}
$showStart = $ccShowDay->getLocalStartDateAndTime();
$showEnd = $ccShowDay->getLocalEndDateAndTime($showStart);
$showEnd = $ccShowDay->getLocalEndDateAndTime();
//check if the first show is in the past
if ($ccShowDay->isShowStartInPast()) {