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

Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor

Browse source 
Conflicts:
	airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/CcFiles.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/services/MediaService.php
This commit is contained in:
Albert Santoni 2015-02-20 16:52:00 -05:00
commit 903de66349
5 changed files with 119 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/modules/rest/controllers/MediaController.php
View file

@ -4,11 +4,6 @@ require_once 'ProxyStorageBackend.php';
class Rest_MediaController extends Zend_Rest_Controller
{
const IMPORT_STATUS_SUCCESS = 0;
const IMPORT_STATUS_PENDING = 1;
const IMPORT_STATUS_FAILED = 2;
public function init()
{
$this->view->layout()->disableLayout();
@ -191,7 +186,6 @@ class Rest_MediaController extends Zend_Rest_Controller
private function unknownErrorResponse()
{
$resp = $this->getResponse();
$resp->setHttpResponseCode(400);
$resp->appendBody("An unknown error occurred.");
}