From 28da7488b05442193950644756bef1e968174abb Mon Sep 17 00:00:00 2001 From: James Date: Tue, 2 Aug 2011 11:24:54 -0400 Subject: [PATCH 1/4] - putting 'gears' as the first option for plupload --- airtime_mvc/public/js/airtime/library/plupload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/library/plupload.js b/airtime_mvc/public/js/airtime/library/plupload.js index a7b4f2aee..41818c748 100644 --- a/airtime_mvc/public/js/airtime/library/plupload.js +++ b/airtime_mvc/public/js/airtime/library/plupload.js @@ -3,7 +3,7 @@ $(document).ready(function() { $("#plupload_files").pluploadQueue({ // General settings - runtimes : 'html5,html4', + runtimes : 'gears, html5, html4', url : '/Plupload/upload/format/json', chunk_size: '5mb', multiple_queues : 'true', From 999f952fc77ea56ed23fc705070f1511ba9d2f1f Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 2 Aug 2011 16:41:04 +0100 Subject: [PATCH 2/4] Fixed label typos in airtime-install script --- install_minimal/airtime-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index cc0765b8a..cc104e775 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -9,7 +9,7 @@ SCRIPTPATH=`dirname $SCRIPT` VIRTUAL_ENV_DIR="/usr/lib/airtime/airtime_virtualenv" if [ ! -d "$VIRTUAL_ENV_DIR" ]; then - echo -e "\n*** Creating Vitualenv for Airtime ***" + echo -e "\n*** Creating Virtualenv for Airtime ***" EXTRAOPTION=$(virtualenv --help | grep extra-search-dir) if [ "$?" -eq "0" ]; then @@ -35,7 +35,7 @@ if [ ! -d "$VIRTUAL_ENV_DIR" ]; then fi done else - echo -e "\n*** Existing Airtime Virturalenv Found ***" + echo -e "\n*** Existing Airtime Virtualenv Found ***" fi virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" From 79ddd93ec8a16ae0db1f5276213cbf35709dd9ad Mon Sep 17 00:00:00 2001 From: James Date: Tue, 2 Aug 2011 13:54:26 -0400 Subject: [PATCH 3/4] CC-2620: Undefined index error on Now playting page after upgrade - fixed --- airtime_mvc/application/models/Preference.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 8396b370b..19fd6da1f 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -315,13 +315,15 @@ class Application_Model_Preference $outputArray['STATION_DESCRIPTION'] = Application_Model_Preference::GetStationDescription(); // get web server info - $url = $systemInfoArray["AIRTIME_VERSION_URL"]; - $index = strpos($url,'/api/'); - $url = substr($url, 0, $index); - - $headerInfo = get_headers(trim($url),1); - $outputArray['WEB_SERVER'] = $headerInfo['Server'][0]; - + if(isset($systemInfoArray["AIRTIME_VERSION_URL"])){ + $url = $systemInfoArray["AIRTIME_VERSION_URL"]; + $index = strpos($url,'/api/'); + $url = substr($url, 0, $index); + + $headerInfo = get_headers(trim($url),1); + $outputArray['WEB_SERVER'] = $headerInfo['Server'][0]; + } + $outputArray['NUM_OF_USERS'] = User::getUserCount(); $outputArray['NUM_OF_SONGS'] = StoredFile::getFileCount(); $outputArray['NUM_OF_PLAYLISTS'] = Playlist::getPlaylistCount(); From 66b1a6794e3bc52aeb938dbbaabe7aec730991ce Mon Sep 17 00:00:00 2001 From: James Date: Tue, 2 Aug 2011 14:20:28 -0400 Subject: [PATCH 4/4] - fixed a bug where it didn't display error msg when duplicate file was uploaded via plupload --- airtime_mvc/public/js/airtime/library/plupload.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/library/plupload.js b/airtime_mvc/public/js/airtime/library/plupload.js index 41818c748..76bdf532b 100644 --- a/airtime_mvc/public/js/airtime/library/plupload.js +++ b/airtime_mvc/public/js/airtime/library/plupload.js @@ -24,8 +24,18 @@ $(document).ready(function() { .append('' + j.error.message + ''); $("#plupload_error").find("table").append(row); + }else{ + $.get('/Plupload/copyfile/format/json/name/'+file.name, function(json){ + var jr = jQuery.parseJSON(json); + if(jr.error !== undefined) { + var row = $("") + .append('' + file.name +'') + .append('' + jr.error.message + ''); + + $("#plupload_error").find("table").append(row); + } + }); } - $.get('/Plupload/copyfile/format/json/name/'+file.name); }); var uploadProgress = false;