Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Rudi Grinberg 2012-11-07 12:05:37 -05:00
parent 110008e909 ccd6447696
commit cd6c305b81
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/StoredFile.php
View File

@ -177,7 +177,7 @@ class Application_Model_StoredFile
$this->_file->setDbOwnerId( $owner->getDbId() ); $this->_file->setDbOwnerId( $owner->getDbId() );
} else { } else {
Logging::info("Could not find suitable owner for file 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 # We don't want to process owner_id in bulk because we already

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

@ -616,7 +616,7 @@ var AIRTIME = (function(AIRTIME) {
text: aData.track_title text: aData.track_title
}, },
ajax: { ajax: {
url: baseUrl+"/Library/get-file-meta-data", url: baseUrl+"/Library/get-file-metadata",
type: "get", type: "get",
data: ({format: "html", id : aData.id, type: aData.ftype}), data: ({format: "html", id : aData.id, type: aData.ftype}),
success: function(data, status) { success: function(data, status) {

3
python_apps/api_clients/api_client.py
View File

@ -159,12 +159,13 @@ class AirtimeApiClient(object):
def __get_airtime_version(self): def __get_airtime_version(self):
# TODO : maybe fix this function to drop an exception? # 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 except Exception: return -1
def is_server_compatible(self, verbose=True): def is_server_compatible(self, verbose=True):
logger = self.logger logger = self.logger
version = self.__get_airtime_version() version = self.__get_airtime_version()
# logger.info('Airtime version found: ' + str(version))
if (version == -1): if (version == -1):
if (verbose): if (verbose):
logger.info('Unable to get Airtime version number.\n') logger.info('Unable to get Airtime version number.\n')