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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
denise 2012-05-07 12:02:15 -04:00
commit 3a6a1d8691
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -226,6 +226,15 @@ class ScheduleController extends Zend_Controller_Action
$showStartLocalDT = Application_Common_DateHelper::ConvertToLocalDateTime($instance->getShowInstanceStart());
$showEndLocalDT = Application_Common_DateHelper::ConvertToLocalDateTime($instance->getShowInstanceEnd());
if ($instance->isRecorded() && $epochNow > $showEndLocalDT->getTimestamp()) {
$file = $instance->getRecordedFile();
$fileId = $file->getId();
$menu["view_recorded"] = array("name" => "View Recorded File Metadata", "icon" => "overview",
"url" => "/library/edit-file-md/id/".$fileId);
}
if ($epochNow < $showStartLocalDT->getTimestamp()) {
if ( ($isAdminOrPM || $isDJ)

8
airtime_mvc/application/models/ShowInstance.php
View file

@ -120,14 +120,10 @@ class Application_Model_ShowInstance {
{
$file_id = $this->_showInstance->getDbRecordedFile();
if(isset($file_id)) {
if (isset($file_id)) {
$file = Application_Model_StoredFile::Recall($file_id);
if (PEAR::isError($file)) {
return null;
}
if(file_exists($file->getFilePath())) {
if (isset($file) && file_exists($file->getFilePath())) {
return $file;
}
}