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

CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist 

-included webstreams in the allowance type list in the error message
This commit is contained in:
denise 2012-09-04 11:29:23 -04:00
parent 0755933ccd
commit 15f750eca5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/PlaylistController.php
View File

@ -155,7 +155,7 @@ class PlaylistController extends Zend_Controller_Action
private function wrongTypeToPlaylist($obj) private function wrongTypeToPlaylist($obj)
{ {
$this->view->error = "You can only add tracks and smart blocks to playlists."; $this->view->error = "You can only add tracks, smart blocks, and webstreams to playlists.";
$this->createFullResponse($obj); $this->createFullResponse($obj);
} }

5
airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
View File

@ -134,7 +134,8 @@ var AIRTIME = (function(AIRTIME){
//process selected files/playlists. //process selected files/playlists.
for (i = 0, length = aData.length; i < length; i++) { for (i = 0, length = aData.length; i < length; i++) {
temp = aData[i]; temp = aData[i];
if (temp.ftype === "audioclip" || temp.ftype === "block") { if (temp.ftype === "audioclip" || temp.ftype === "block" ||
(temp.ftype === "stream" && $("#obj_type").val() === "playlist")) {
aMediaIds.push(new Array (temp.id, temp.ftype)); aMediaIds.push(new Array (temp.id, temp.ftype));
} }
} }
@ -144,7 +145,7 @@ var AIRTIME = (function(AIRTIME){
if ($('#obj_type').val() == 'block') { if ($('#obj_type').val() == 'block') {
alert('You can only add tracks to smart blocks.'); alert('You can only add tracks to smart blocks.');
} else if ($('#obj_type').val() == 'playlist') { } else if ($('#obj_type').val() == 'playlist') {
alert('You can only add tracks and smart blocks to playlists.'); alert('You can only add tracks, smart blocks, and webstreams to playlists.');
} }
} }
}); });