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

CC-4303: Library Tab grays out after certain scenario with normal playlist 

-fixed
This commit is contained in:
denise 2012-09-06 11:48:00 -04:00
parent 35a5e38aca
commit 8d1003bbbe
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -447,7 +447,7 @@ class PlaylistController extends Zend_Controller_Action
} catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($e);
} catch (PlaylistNotFoundException $e) {
$this->playlistNotFound($type);
$this->playlistNotFound($type, true);
} catch (Exception $e) {
$this->playlistUnknownError($e);
}

4
airtime_mvc/public/js/airtime/library/spl.js
View File

@ -632,6 +632,10 @@ var AIRTIME = (function(AIRTIME){
{format: "json", data: criteria, name: block_name, description: block_desc, obj_id: obj_id, type: obj_type, modified: lastMod},
function(data){
var json = $.parseJSON(data);
if (json.error !== undefined) {
alert(json.error);
}
AIRTIME.playlist.fnOpenPlaylist(json);
setModified(json.modified);
if (obj_type == "block") {
callback(data, "save");