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

-fixed

airtime_mvc/application/controllers/PlaylistController.php

@@ -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) {

airtime_mvc/application/models/Block.php

@@ -875,12 +875,21 @@ EOT;
     */
     public static function deleteBlocks($p_ids, $p_userId)
     {
+        $userInfo = Zend_Auth::getInstance()->getStorage()->read();
+        $user = new Application_Model_User($userInfo->id);
+        $isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
+        
+        if (!$isAdminOrPM) {
             $leftOver = self::blocksNotOwnedByUser($p_ids, $p_userId);
+        
             if (count($leftOver) == 0) {
                 CcBlockQuery::create()->findPKs($p_ids)->delete();
             } else {
                 throw new BlockNoPermissionException;
             }
+        } else {
+            CcBlockQuery::create()->findPKs($p_ids)->delete();
+        }
     }
     
     // This function returns that are not owen by $p_user_id among $p_ids

airtime_mvc/application/models/Playlist.php

@@ -874,12 +874,20 @@ SQL;
      */
     public static function deletePlaylists($p_ids, $p_userId)
     {
+        $userInfo = Zend_Auth::getInstance()->getStorage()->read();
+        $user = new Application_Model_User($userInfo->id);
+        $isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
+        
+        if (!$isAdminOrPM) {
             $leftOver = self::playlistsNotOwnedByUser($p_ids, $p_userId);
             if (count($leftOver) == 0) {
                 CcPlaylistQuery::create()->findPKs($p_ids)->delete();
             } else {
                 throw new PlaylistNoPermissionException;
             }
+        } else {
+            CcPlaylistQuery::create()->findPKs($p_ids)->delete();
+        }
     }
     
     // This function returns that are not owen by $p_user_id among $p_ids