Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-4219: Smart Playlist: Cannot preview static block 

-fixed
This commit is contained in:
denise 2012-08-15 12:10:56 -04:00
parent d366220b85
commit 4d9a31b3c1
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
airtime_mvc/application/controllers/AudiopreviewController.php
View File

@ -191,8 +191,14 @@ class AudiopreviewController extends Zend_Controller_Action
'element_id' => isset($track['id'])?$track['id']:"",
'element_position' => isset($track['position'])?$track['position']:"",
);
/* If the track type is static we know it must be
* a track because static blocks can only contain
* tracks
*/
if ($track['type'] == 'static') {
$track['type'] = 0;
}
$elementMap['type'] = $track['type'];
if ($track['type'] == 0) {

3
airtime_mvc/public/js/airtime/library/library.js
View File

@ -426,6 +426,9 @@ var AIRTIME = (function(AIRTIME) {
open_audio_preview(aData.ftype, aData.audioFile, aData.track_title, aData.artist_name);
} else if (aData.ftype == 'stream') {
open_audio_preview(aData.ftype, aData.audioFile, aData.track_title, aData.artist_name);
} else if (aData.ftype == 'block') {
blockIndex = $(this).parent().attr('id').substring(3); //remove the bl_
open_block_preview(blockIndex, 0);
}
return false;
});