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

Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x

Browse source
This commit is contained in:
Naomi Aro 2011-12-14 17:59:56 +01:00
commit d8df3bb2d8
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
airtime_mvc/application/controllers/ScheduleController.php
View file

@ -238,7 +238,7 @@ class ScheduleController extends Zend_Controller_Action
'title' => 'Cancel Current Show');
}
if ($epochNow < $showStartDateHelper->getTimestamp()) {
if ($epochNow < $showStartDateHelper->getTimestamp()) {
if ($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) {
@ -246,13 +246,15 @@ class ScheduleController extends Zend_Controller_Action
'callback' => 'window["beginEditShow"]'), 'title' => 'Edit Show');
$menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/delete-show'.$params,
'callback' => 'window["scheduleRefetchEvents"]'), 'title' => 'Delete This Instance');
$menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/cancel-show'.$params,
'callback' => 'window["scheduleRefetchEvents"]'), 'title' => 'Delete This Instance and All Following');
if ($show->getShow()->isRepeating()) {
$menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/cancel-show'.$params,
'callback' => 'window["scheduleRefetchEvents"]'), 'title' => 'Delete This Instance and All Following');
}
}
}
}
//returns format jjmenu is looking for.
die(json_encode($menu));
//returns format jjmenu is looking for.
die(json_encode($menu));
}
public function scheduleShowAction()