From 4200059200f334acb3f6b857d22e346c629fc318 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 7 Nov 2012 11:43:49 -0500 Subject: [PATCH 1/2] -airtime_version fix --- python_apps/api_clients/api_client.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py index ac93aa4c6..b35ce5395 100644 --- a/python_apps/api_clients/api_client.py +++ b/python_apps/api_clients/api_client.py @@ -159,12 +159,13 @@ class AirtimeApiClient(object): def __get_airtime_version(self): # TODO : maybe fix this function to drop an exception? - try: return self.services.version_url() + try: return self.services.version_url()[u'version'] except Exception: return -1 def is_server_compatible(self, verbose=True): logger = self.logger version = self.__get_airtime_version() + # logger.info('Airtime version found: ' + str(version)) if (version == -1): if (verbose): logger.info('Unable to get Airtime version number.\n') From ccd64476968dc08e1cd6415e11ab1824fb95d243 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 7 Nov 2012 12:05:20 -0500 Subject: [PATCH 2/2] - install failed due to wrong metadata key - wrong controller action called --- airtime_mvc/application/models/StoredFile.php | 2 +- airtime_mvc/public/js/airtime/library/library.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 56e589bd9..8be6cd639 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -177,7 +177,7 @@ class Application_Model_StoredFile $this->_file->setDbOwnerId( $owner->getDbId() ); } else { Logging::info("Could not find suitable owner for file - '".$p_md['MDATA_KEY_FILEPATH']."'"); + '".$p_md['filepath']."'"); } } # We don't want to process owner_id in bulk because we already diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 1ef177678..3b7c956be 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -616,7 +616,7 @@ var AIRTIME = (function(AIRTIME) { text: aData.track_title }, ajax: { - url: baseUrl+"/Library/get-file-meta-data", + url: baseUrl+"/Library/get-file-metadata", type: "get", data: ({format: "html", id : aData.id, type: aData.ftype}), success: function(data, status) {