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

CC-84: Smart Playlists

Browse source 
- merging code
This commit is contained in:
James 2012-07-26 16:16:07 -04:00
parent 8755500d30
commit 7cde4ba2ba
5 changed files with 54 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,6 +70,7 @@ class PlaylistController extends Zend_Controller_Action
$this->view->length = $formatter->format();
$this->view->obj = $obj;
Logging::log($obj->getContents());
$this->view->html = $this->view->render('playlist/update.phtml');
$this->view->name = $obj->getName();
$this->view->description = $obj->getDescription();
@ -297,23 +298,31 @@ class PlaylistController extends Zend_Controller_Action
$ids = (!is_array($ids)) ? array($ids) : $ids;
$afterItem = $this->_getParam('afterItem', null);
$addType = $this->_getParam('type', 'after');
// this is the obj type of destination
$obj_type = $this->_getParam('obj_type');
try {
$obj = $this->getPlaylist($obj_type);
if ($obj_type == 'playlist' || $obj->isStatic()) {
if ($obj_type == 'playlist') {
$obj->addAudioClips($ids, $afterItem, $addType);
} else if ($obj->isStatic()) {
// if the dest is a block object
$obj->addAudioClips($ids, $afterItem, $addType);
$this->createUpdateResponse($obj);
} else {
throw new PlaylistDyanmicException;
}
} catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($pl, $e);
} catch (PlaylistNotFoundException $e) {
$this->playlistNotFound();
} catch (PlaylistDyanmicException $e) {
$this->playlistDynamic($pl);
} catch (Exception $e) {
$this->createUpdateResponse($obj);
}
catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($e);
}
catch (PlaylistNotFoundException $e) {
$this->playlistNotFound($obj_type);
}
catch (PlaylistDyanmicException $e) {
$this->playlistDynamic($obj);
}
catch (Exception $e) {
$this->playlistUnknownError($e);
}
}