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

Merge branch 'master' of dev.sourcefabric.org:airtime

Browse source
This commit is contained in:
Naomi 2013-05-08 14:21:55 -04:00
commit 35c8e80f6b
5 changed files with 40 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/services/CalendarService.php
View file

@ -67,6 +67,11 @@ class Application_Service_CalendarService
"name"=> $text,
"icon" => "soundcloud");
}
} else {
$menu["content"] = array(
"name"=> _("Show Content"),
"icon" => "overview",
"url" => $baseUrl."schedule/show-content-dialog");
}
} else {
//Show content can be modified from the calendar if:

6
airtime_mvc/application/services/SchedulerService.php
View file

@ -68,8 +68,12 @@ class Application_Service_SchedulerService
$ccSchedules = CcScheduleQuery::create()
->filterByDbInstanceId($instanceIds, Criteria::IN)
->find();
$interval = new DateInterval("PT".abs($diff)."S");
if ($diff < 0) {
$interval->invert = 1;
}
foreach ($ccSchedules as $ccSchedule) {
$interval = new DateInterval("PT".$diff."S");
$start = new DateTime($ccSchedule->getDbStarts());
$newStart = $start->add($interval);
$end = new DateTime($ccSchedule->getDbEnds());