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

This commit is contained in:
drigato 2014-04-14 11:25:02 -04:00
commit edcf8844e3
4 changed files with 38 additions and 3 deletions

View file

@ -25,6 +25,11 @@ class PluploadController extends Zend_Controller_Action
$this->view->headLink()->appendStylesheet($baseUrl.'css/plupload.queue.css?'.$CC_CONFIG['airtime_version']);
$this->view->headLink()->appendStylesheet($baseUrl.'css/addmedia.css?'.$CC_CONFIG['airtime_version']);
$this->view->quotaLimitReached = false;
if (Application_Model_Preference::getDiskUsage() > Application_Model_Preference::getDiskQuota()) {
$this->view->quotaLimitReached = true;
}
}
public function recentUploadsAction()