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-cloud-storage-saas

Browse source
This commit is contained in:
drigato 2014-11-13 09:42:15 -05:00
commit 6cba0b5bde
1 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -223,11 +223,9 @@ class Rest_MediaController extends Zend_Rest_Controller
if (!$this->validateRequestData($file, $whiteList)) { if (!$this->validateRequestData($file, $whiteList)) {
$file->save(); $file->save();
return; return;
} else if ($file) { } else if ($file && isset($requestData["resource_id"])) {
$file->fromArray($whiteList, BasePeer::TYPE_FIELDNAME); $file->fromArray($whiteList, BasePeer::TYPE_FIELDNAME);
//file is stored in the cloud
if (isset($requestData["resource_id"])) {
//store the original filename //store the original filename
$file->setDbFilepath($requestData["filename"]); $file->setDbFilepath($requestData["filename"]);
@ -242,7 +240,6 @@ class Rest_MediaController extends Zend_Rest_Controller
$cloudFile->setResourceId($requestData["resource_id"]); $cloudFile->setResourceId($requestData["resource_id"]);
$cloudFile->setCcFiles($file); $cloudFile->setCcFiles($file);
$cloudFile->save(); $cloudFile->save();
}
Application_Model_Preference::updateDiskUsage($fileSizeBytes); Application_Model_Preference::updateDiskUsage($fileSizeBytes);