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

CC-4257: Smart Block: Admin cannot delete DJ user's block

Browse source 
-fixed
This commit is contained in:
denise 2012-08-21 15:42:44 -04:00
parent f52cb81c64
commit 2cdaa186e3
3 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/controllers/PlaylistController.php
View file

@ -140,6 +140,8 @@ class PlaylistController extends Zend_Controller_Action
private function playlistNoPermission($p_type)
{
$this->view->error = "You don't have permission to delete selected {$p_type}(s).";
$this->changePlaylist(null, $p_type);
$this->createFullResponse(null);
}
private function playlistUnknownError($e)
@ -294,6 +296,8 @@ class PlaylistController extends Zend_Controller_Action
$this->createFullResponse($obj);
} catch (PlaylistNoPermissionException $e) {
$this->playlistNoPermission($type);
} catch (BlockNoPermissionException $e) {
$this->playlistNoPermission($type);
} catch (PlaylistNotFoundException $e) {
$this->playlistNotFound($type);
} catch (Exception $e) {