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

CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up 

-fixed for dragging tracks into deleted blocks
This commit is contained in:
denise 2012-08-29 16:13:18 -04:00
parent 7c79aad5f4
commit 80258f1fb7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,10 +124,10 @@ class PlaylistController extends Zend_Controller_Action
Logging::info("{$p_type} not found");
Application_Model_Library::changePlaylist(null, $p_type);
if ($p_type == 'Playlist') {
if (!$p_isJson) {
$this->createFullResponse(null);
} else {
die(json_encode(array("error"=>$this->view->error, "result"=>1, "html"=>$this->createFullResponse(null, true))));
die(json_encode(array("error"=>$this->view->error, "result"=>1, "html"=>$this->createFullResponse(null, $p_isJson))));
}
}
@ -288,6 +288,8 @@ class PlaylistController extends Zend_Controller_Action
$this->wrongTypeToPlaylist($obj);
} catch (BlockDynamicException $e) {
$this->blockDynamic($obj);
} catch (BlockNotFoundException $e) {
$this->playlistNotFound($obj_type);
} catch (Exception $e) {
$this->playlistUnknownError($e);
}