Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas

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

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) {

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')