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

CC-3687 : Remove context menus from recorded shows since they are blank.

This commit is contained in:
Naomi Aro 2012-05-07 17:48:56 +02:00
parent a79514c8ee
commit df4cdfb07e
3 changed files with 20 additions and 6 deletions
Show Stats 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()); $showStartLocalDT = Application_Common_DateHelper::ConvertToLocalDateTime($instance->getShowInstanceStart());
$showEndLocalDT = Application_Common_DateHelper::ConvertToLocalDateTime($instance->getShowInstanceEnd()); $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 ($epochNow < $showStartLocalDT->getTimestamp()) {
if ( ($isAdminOrPM || $isDJ) 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(); $file_id = $this->_showInstance->getDbRecordedFile();
if(isset($file_id)) { if (isset($file_id)) {
$file = Application_Model_StoredFile::Recall($file_id); $file = Application_Model_StoredFile::Recall($file_id);
if (PEAR::isError($file)) { if (isset($file) && file_exists($file->getFilePath())) {
return null;
}
if(file_exists($file->getFilePath())) {
return $file; return $file;
} }
} }

9
airtime_mvc/public/js/airtime/schedule/schedule.js
View File

@ -354,6 +354,15 @@ $(document).ready(function() {
oItems.cancel_recorded.callback = callback; oItems.cancel_recorded.callback = callback;
} }
//define a view recorded callback.
if (oItems.view_recorded !== undefined) {
callback = function() {
document.location.href = oItems.view_recorded.url;
};
oItems.view_recorded.callback = callback;
}
//define a cancel callback. //define a cancel callback.
if (oItems.cancel !== undefined) { if (oItems.cancel !== undefined) {