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

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

Browse source 
Conflicts:
	airtime_mvc/application/models/airtime/CcFiles.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
This commit is contained in:
Albert Santoni 2015-02-20 11:14:11 -05:00
commit 6d00da89db
601 changed files with 118801 additions and 207033 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -142,7 +142,6 @@ class Rest_MediaController extends Zend_Rest_Controller
if (!$id) {
return;
}
try {
CcFiles::deleteById($id);
$this->getResponse()
@ -175,6 +174,13 @@ class Rest_MediaController extends Zend_Rest_Controller
$resp->setHttpResponseCode(404);
$resp->appendBody("ERROR: Media not found.");
}
private function importFailedResponse()
{
$resp = $this->getResponse();
$resp->setHttpResponseCode(200);
$resp->appendBody("ERROR: Import Failed.");
}
private function unknownErrorResponse()
{