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

CC-3675: Playlist -> the files from Disconnected Mediafolder can still

Browse source 
be previewed (played)

- done
This commit is contained in:
James 2012-04-24 12:59:07 -04:00
parent a41f100545
commit 3c4d01aa93
4 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/controllers/AudiopreviewController.php
View file

@ -98,7 +98,7 @@ class AudiopreviewController extends Zend_Controller_Action
$pl = new Application_Model_Playlist($playlistID);
$result = Array();
foreach ( $pl->getContents() as $track ){
foreach ( $pl->getContents(true) as $track ){
$elementMap = array( 'element_title' => isset($track['CcFiles']['track_title'])?$track['CcFiles']['track_title']:"",
'element_artist' => isset($track['CcFiles']['artist_name'])?$track['CcFiles']['artist_name']:"",
@ -115,7 +115,7 @@ class AudiopreviewController extends Zend_Controller_Action
}
$result[] = $elementMap;
}
$this->_helper->json($result);
}

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

@ -373,7 +373,7 @@ class ScheduleController extends Zend_Controller_Action
$this->view->switch_status = $switch_status;
$this->view->entries = $range;
$this->view->show_name = $show[0]["name"];
$this->view->show_name = isset($show[0])?$show[0]["name"]:"";
}
public function removeGroupAction()