From 8d1003bbbec08d4ce9a43a43e1e17bddb74145db Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 6 Sep 2012 11:48:00 -0400 Subject: [PATCH] CC-4303: Library Tab grays out after certain scenario with normal playlist -fixed --- airtime_mvc/application/controllers/PlaylistController.php | 2 +- airtime_mvc/public/js/airtime/library/spl.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index d352344ff..6d9a9d8c3 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -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); } diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 46a0945b7..907078e18 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -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");