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:
commit
87d5d3cb02
|
@ -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(
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue