From 0ab08af48f05ed21806056c087cdbc14e21eb74f Mon Sep 17 00:00:00 2001 From: James Date: Mon, 10 Sep 2012 14:37:38 -0400 Subject: [PATCH] CC-4380: Show ReplayGain value in the Library page - done --- airtime_mvc/application/models/Datatables.php | 2 +- airtime_mvc/application/models/StoredFile.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Datatables.php b/airtime_mvc/application/models/Datatables.php index 60451972e..67586b3b3 100644 --- a/airtime_mvc/application/models/Datatables.php +++ b/airtime_mvc/application/models/Datatables.php @@ -118,7 +118,7 @@ class Application_Model_Datatables foreach ($searchCols as $col) { $simpleWhere['clause']["simple_".$col] = "{$col}::text ILIKE :simple_".$col; - $simpleWhere['params']["simple_".$col] = "%".$term."%"; + $simpleWhere['params']["simple_".$col] = "%".$term."%"; } $outerCond[] = "(".implode(" OR ", $simpleWhere['clause']).")"; } diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 53ded3e94..4d62bccb6 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -688,6 +688,11 @@ class Application_Model_StoredFile $blSelect[] = "login AS ".$key; $fileSelect[] = "sub.login AS $key"; $streamSelect[] = "login AS ".$key; + } elseif ($key === "replay_gain") { + $plSelect[] = "NULL::NUMERIC AS ".$key; + $blSelect[] = "NULL::NUMERIC AS ".$key; + $fileSelect[] = "replay_gain AS $key"; + $streamSelect[] = "NULL::NUMERIC AS ".$key; } //same columns in each table. else if (in_array($key, array("length", "utime", "mtime"))) {