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

CC-2591: Change function name 

- done
- extra fix: fix was needed due to class name change
This commit is contained in:
James 2011-09-22 14:01:05 -04:00
parent 95a2c179c2
commit 965a649d0e
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
airtime_mvc/application/controllers/LibraryController.php
View File

@ -14,7 +14,7 @@ class LibraryController extends Zend_Controller_Action
->addActionContext('context-menu', 'json')
->addActionContext('get-file-meta-data', 'html')
->addActionContext('upload-file-soundcloud', 'json')
->addActionContext('get-upload-to-sc-status', 'json')
->addActionContext('get-upload-to-soundcloud-status', 'json')
->initContext();
$this->pl_sess = new Zend_Session_Namespace(UI_PLAYLIST_SESSNAME);
@ -180,7 +180,7 @@ class LibraryController extends Zend_Controller_Action
//format clip lengh to 1 decimal
foreach($datatables["aaData"] as &$data){
if($data[6] == 'audioclip'){
$file = StoredFile::Recall($data[0]);
$file = Application_Model_StoredFile::Recall($data[0]);
$scid = $file->getSoundCloudId();
if($scid == "-2"){
$data[1] .= '<span id="'.$data[0].'" class="small-icon progress"></span>';
@ -249,7 +249,7 @@ class LibraryController extends Zend_Controller_Action
die();
}
public function getUploadToScStatusAction(){
public function getUploadToSoundcloudStatusAction(){
$id = $this->_getParam('id');
$type = $this->_getParam('type');
if($type == "show"){
@ -259,7 +259,7 @@ class LibraryController extends Zend_Controller_Action
$this->view->error_code = $file->getSoundCloudErrorCode();
$this->view->error_msg = $file->getSoundCloudErrorMsg();
}else{
$file = StoredFile::Recall($id);
$file = Application_Model_StoredFile::Recall($id);
$this->view->sc_id = $file->getSoundCloudId();
$this->view->error_code = $file->getSoundCloudErrorCode();
$this->view->error_msg = $file->getSoundCloudErrorMsg();

6
airtime_mvc/application/models/Shows.php
View File

@ -1245,7 +1245,7 @@ class Show {
// get soundcloud_id
if(!is_null($show["file_id"])){
$file = StoredFile::Recall($show["file_id"]);
$file = Application_Model_StoredFile::Recall($show["file_id"]);
$soundcloud_id = $file->getSoundCloudId();
}else{
$soundcloud_id = null;
@ -1364,13 +1364,13 @@ class ShowInstance {
public function setSoundCloudFileId($p_soundcloud_id)
{
$file = StoredFile::Recall($this->_showInstance->getDbRecordedFile());
$file = Application_Model_StoredFile::Recall($this->_showInstance->getDbRecordedFile());
$file->setSoundCloudFileId($p_soundcloud_id);
}
public function getSoundCloudFileId()
{
$file = StoredFile::Recall($this->_showInstance->getDbRecordedFile());
$file = Application_Model_StoredFile::Recall($this->_showInstance->getDbRecordedFile());
return $file->getSoundCloudId();
}

6
airtime_mvc/public/js/airtime/library/library.js
View File

@ -159,7 +159,7 @@ function addProgressIcon(id) {
}
function checkSCUploadStatus(){
var url = '/Library/get-upload-to-sc-status/format/json';
var url = '/Library/get-upload-to-soundcloud-status/format/json';
$("span[class*=progress]").each(function(){
var id = $(this).attr("id");
$.post(url, {format: "json", id: id, type:"file"}, function(json){
@ -198,7 +198,7 @@ function addQtipToSCIcons(){
content: {
text: "Retreiving data from the server...",
ajax: {
url: "/Library/get-upload-to-sc-status",
url: "/Library/get-upload-to-soundcloud-status",
type: "post",
data: ({format: "json", id : id, type: "file"}),
success: function(json, status){
@ -224,7 +224,7 @@ function addQtipToSCIcons(){
content: {
text: "Retreiving data from the server...",
ajax: {
url: "/Library/get-upload-to-sc-status",
url: "/Library/get-upload-to-soundcloud-status",
type: "post",
data: ({format: "json", id : id, type: "file"}),
success: function(json, status){

6
airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
View File

@ -330,7 +330,7 @@ function getFullCalendarEvents(start, end, callback) {
}
function checkSCUploadStatus(){
var url = '/Library/get-upload-to-sc-status/format/json';
var url = '/Library/get-upload-to-soundcloud-status/format/json';
$("span[class*=progress]").each(function(){
var id = $(this).attr("id");
$.post(url, {format: "json", id: id, type:"show"}, function(json){
@ -368,7 +368,7 @@ function addQtipToSCIcons(ele){
content: {
text: "Retreiving data from the server...",
ajax: {
url: "/Library/get-upload-to-sc-status",
url: "/Library/get-upload-to-soundcloud-status",
type: "post",
data: ({format: "json", id : id, type: "file"}),
success: function(json, status){
@ -394,7 +394,7 @@ function addQtipToSCIcons(ele){
content: {
text: "Retreiving data from the server...",
ajax: {
url: "/Library/get-upload-to-sc-status",
url: "/Library/get-upload-to-soundcloud-status",
type: "post",
data: ({format: "json", id : id, type: "show"}),
success: function(json, status){

2
utils/soundcloud-uploader.php
View File

@ -59,7 +59,7 @@ if(count($argv) != 2){
}
$id = $argv[1];
$file = StoredFile::Recall($id);
$file = Application_Model_StoredFile::Recall($id);
// set id with -2 which is indicator for processing
$file->setSoundCloudFileId(-2);
$file->uploadToSoundCloud();