Merge branch 'master' of dev.sourcefabric.org:airtime
This commit is contained in:
commit
730df4c345
3 changed files with 70 additions and 34 deletions
|
@ -173,7 +173,12 @@ class PluploadController extends Zend_Controller_Action
|
|||
$soundcloud->uploadTrack($file->getRealFilePath(), $file->getName());
|
||||
}
|
||||
|
||||
die('{"jsonrpc" : "2.0", "id" : '.$file->getId().' }');
|
||||
$show_instance = $this->_getParam('show_instance');
|
||||
|
||||
$show = new ShowInstance($show_instance);
|
||||
$show->setRecordedFile($file->getId());
|
||||
|
||||
die('{"jsonrpc" : "2.0", "id" : '.$file->getId().'}');
|
||||
}
|
||||
|
||||
public function pluploadAction()
|
||||
|
|
|
@ -707,6 +707,14 @@ class ShowInstance {
|
|||
->delete();
|
||||
}
|
||||
|
||||
public function setRecordedFile($file_id) {
|
||||
|
||||
$showInstance = CcShowInstancesQuery::create()
|
||||
->findPK($this->_instanceId);
|
||||
$showInstance->setDbRecordedFile($file_id)
|
||||
->save();
|
||||
}
|
||||
|
||||
public function getTimeScheduled() {
|
||||
|
||||
$instance_id = $this->getShowInstanceId();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue