Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Martin Konecny 2012-09-11 14:04:53 -04:00
commit c61f5d1972
6 changed files with 18 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/models/Datatables.php
View file

@ -73,13 +73,12 @@ class Application_Model_Datatables
$orig2searchTerm[$index] = $d;
}
}
// map that maps current column position to original position
$current2orig = $librarySetting['ColReorder'];
// map that maps dbname to searchTerm
$dbname2searchTerm = array();
foreach ($current2dbname as $currentPos=>$dbname) {
$dbname2searchTerm[$dbname] = $orig2searchTerm[$current2orig[$currentPos]];
$dbname2searchTerm[$dbname] =
$orig2searchTerm[$librarySetting($currentPos)];
}
$where = array();

9
airtime_mvc/application/models/Preference.php
View file

@ -1130,6 +1130,13 @@ class Application_Model_Preference
public static function getCurrentLibraryTableSetting()
{
return unserialize(self::getValue("library_datatable"));
$v = self::getValue("library_datatable");
if( $v === '' ) {
return function ($x) { return $x; };
} else {
$ds = unserialize($v);
return function ($x) use ($ds) { return $ds['ColReorder'][$x]; } ;
}
//return unserialize(self::getValue("library_datatable"));
}
}

19
airtime_mvc/application/models/airtime/Common.php
View file

@ -1,19 +0,0 @@
<?php
class Common {
public static function setTimeInSub($row, $col, $time)
{
$class = get_class($row).'Peer';
$con = Propel::getConnection($class::DATABASE_NAME);
$sql = 'UPDATE '.$class::TABLE_NAME
. ' SET '.$col.' = :f1'
. ' WHERE ' .$class::ID. ' = :p1';
$stmt = $con->prepare($sql);
$stmt->bindValue(':f1', $time);
$stmt->bindValue(':p1', $row->getDbId());
$stmt->execute();
}
}