cc-2263: unable to cancel recording show.

-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

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()