Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 

Conflicts:
	airtime_mvc/application/modules/rest/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
This commit is contained in:
drigato 2014-11-03 13:11:22 -05:00
parent 0a45de7fba 5f98151009
commit 87d5d3cb02
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
airtime_mvc/application/modules/rest/Bootstrap.php
View File

@ -34,19 +34,6 @@ class Rest_Bootstrap extends Zend_Application_Module_Bootstrap
)
);
$router->addRoute('clear', $clearLibraryRoute);
$deleteSuccessRoute = new Zend_Controller_Router_Route(
'rest/media/:id/delete-success',
array(
'controller' => 'media',
'action' => 'delete-success',
'module' => 'rest'
),
array(
'id' => '\d+'
)
);
$router->addRoute('delete-success', $deleteSuccessRoute);
/** ShowController Routes **/
$uploadImageRoute = new Zend_Controller_Router_Route(

4
airtime_mvc/application/modules/rest/controllers/MediaController.php
View File

@ -21,13 +21,9 @@ class Rest_MediaController extends Zend_Rest_Controller
public function init()
{
$this->view->layout()->disableLayout();
$ajaxContext = $this->_helper->getHelper('AjaxContext');
$ajaxContext->addActionContext('delete-success', 'json');
// Remove reliance on .phtml files to render requests
$this->_helper->viewRenderer->setNoRender(true);
}
public function indexAction()