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

cc-2263: unable to cancel recording show.

Browse source 
-almost final check-in. Everything looks good right now...
This commit is contained in:
martin 2011-05-17 16:42:52 -04:00
parent 167a55591b
commit a48f467de7
3 changed files with 42 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/controllers/ApiController.php
View file

@ -263,6 +263,14 @@ class ApiController extends Zend_Controller_Action
$end_timestamp = $now->add(new DateInterval("PT2H"));
$end_timestamp = $end_timestamp->format("Y-m-d H:i:s");
$this->view->shows = Show::getShows($today_timestamp, $end_timestamp, $excludeInstance=NULL, $onlyRecord=TRUE);
$this->view->is_recording = false;
$rows = Show_DAL::GetCurrentShow($today_timestamp);
if (count($rows) > 0){
$this->view->is_recording = ($rows[0]['record'] == 1);
}
}
public function uploadRecordedAction()

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

@ -238,7 +238,7 @@ class ScheduleController extends Zend_Controller_Action
if (strtotime($show->getShowStart()) <= strtotime($today_timestamp) &&
strtotime($today_timestamp) < strtotime($show->getShowEnd()) &&
$user->isAdmin() && !$show->isRecorded()) {
$user->isAdmin()) {
$menu[] = array('action' => array('type' => 'fn',
'callback' => "window['confirmCancelShow']($id)"),
'title' => 'Cancel Current Show');