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

Make sure we are using the Library controller for the Library page

Browse source
This commit is contained in:
Martin Konecny 2012-08-21 11:12:33 -04:00
parent d2eca0faaf
commit 51ebae3de9
5 changed files with 79 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,7 @@ class PlaylistController extends Zend_Controller_Action
{
$obj = null;
$objInfo = $this->getObjInfo($p_type);
$objInfo = Application_Model_Playlist::getObjInfo($p_type);
if (isset($this->obj_sess->id)) {
$obj = new $objInfo['className']($this->obj_sess->id);
@ -195,7 +195,7 @@ class PlaylistController extends Zend_Controller_Action
try {
if (isset($this->obj_sess->id)) {
$objInfo = $this->getObjInfo($this->obj_sess->type);
$objInfo = Application_Model_Playlist::getObjInfo($this->obj_sess->type);
$obj = new $objInfo['className']($this->obj_sess->id);
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id);
@ -227,7 +227,7 @@ class PlaylistController extends Zend_Controller_Action
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$type = $this->_getParam('type');
$objInfo = $this->getObjInfo($type);
$objInfo = Application_Model_Playlist::getObjInfo($type);
$name = 'Untitled Playlist';
if ($type == 'block') {
@ -246,7 +246,7 @@ class PlaylistController extends Zend_Controller_Action
{
$id = $this->_getParam('id', null);
$type = $this->_getParam('type');
$objInfo = $this->getObjInfo($type);
$objInfo = Application_Model_Playlist::getObjInfo($type);
Logging::log("editing {$type} {$id}");
if (!is_null($id)) {
@ -271,7 +271,7 @@ class PlaylistController extends Zend_Controller_Action
$obj = null;
$objInfo = $this->getObjInfo($type);
$objInfo = Application_Model_Playlist::getObjInfo($type);
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id);
@ -588,19 +588,6 @@ class PlaylistController extends Zend_Controller_Action
}
}
public function getObjInfo($p_type)
{
$info = array();
if (strcmp($p_type, 'playlist')==0) {
$info['className'] = 'Application_Model_Playlist';
} else {
$info['className'] = 'Application_Model_Block';
}
return $info;
}
public function getBlockInfoAction()
{
$request = $this->getRequest();