Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x

This commit is contained in:
Daniel 2012-02-17 16:49:44 -05:00
commit 5dd94ce12c
205 changed files with 70643 additions and 603 deletions

View file

@ -14,8 +14,8 @@ defined('APPLICATION_ENV')
// Ensure library/ is on include_path
set_include_path(implode(PATH_SEPARATOR, array(
realpath(APPLICATION_PATH . '/../library'),
get_include_path(),
realpath(APPLICATION_PATH . '/../library')
)));
//Propel classes.

View file

@ -0,0 +1,6 @@
<?php
/* The purpose of this file is get PHP to clear its cache regarding the
* filesystem layout. See this ticket http://dev.sourcefabric.org/browse/CC-3320 */
clearstatcache(true);

View file

@ -30,9 +30,11 @@ function generatePartitions(partitions){
var tr = $(row);
lastElement.after(tr);
var watched_dirs_ul = $('#watched-dir-list-'+i);
for (var j=0; j<partitions[i].dirs.length; j++){
watched_dirs_ul.append('<li>'+partitions[i].dirs[j]+'</li>');
if (partitions[i].dirs){
var watched_dirs_ul = $('#watched-dir-list-'+i);
for (var j=0; j<partitions[i].dirs.length; j++){
watched_dirs_ul.append('<li>'+partitions[i].dirs[j]+'</li>');
}
}
lastElement = tr;
}