From 4d9a31b3c1837c2e8cb422cb1e740942ff53b507 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 15 Aug 2012 12:10:56 -0400 Subject: [PATCH] CC-4219: Smart Playlist: Cannot preview static block -fixed --- .../application/controllers/AudiopreviewController.php | 10 ++++++++-- airtime_mvc/public/js/airtime/library/library.js | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php index e32ba730a..320921444 100644 --- a/airtime_mvc/application/controllers/AudiopreviewController.php +++ b/airtime_mvc/application/controllers/AudiopreviewController.php @@ -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) { diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 3d58b9bcd..3ec3232ac 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -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; });