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

CC-4539: Advanced search: Sample rate searched on Hz, but search results 

shown in kHz

- fixed
This commit is contained in:
james 2012-10-31 12:32:40 -04:00
parent 9293a26738
commit 2e4d5ec142
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/models/Datatables.php
View File

@ -13,9 +13,9 @@ class Application_Model_Datatables
if ($dbname == 'utime' || $dbname == 'mtime') { if ($dbname == 'utime' || $dbname == 'mtime') {
$input1 = isset($info[0])?Application_Common_DateHelper::ConvertToUtcDateTimeString($info[0]):null; $input1 = isset($info[0])?Application_Common_DateHelper::ConvertToUtcDateTimeString($info[0]):null;
$input2 = isset($info[1])?Application_Common_DateHelper::ConvertToUtcDateTimeString($info[1]):null; $input2 = isset($info[1])?Application_Common_DateHelper::ConvertToUtcDateTimeString($info[1]):null;
} else if($dbname == 'bit_rate') { } else if($dbname == 'bit_rate' || $dbname == 'sample_rate') {
$input1 = isset($info[0])?intval($info[0]) * 1000:null; $input1 = isset($info[0])?doubleval($info[0]) * 1000:null;
$input2 = isset($info[1])?intval($info[1]) * 1000:null; $input2 = isset($info[1])?doubleval($info[1]) * 1000:null;
} else { } else {
$input1 = isset($info[0])?$info[0]:null; $input1 = isset($info[0])?$info[0]:null;
$input2 = isset($info[1])?$info[1]:null; $input2 = isset($info[1])?$info[1]:null;

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

@ -1195,7 +1195,7 @@ var validationTypes = {
"owner_id" : "s", "owner_id" : "s",
"rating" : "i", "rating" : "i",
"replay_gain" : "n", "replay_gain" : "n",
"sample_rate" : "i", "sample_rate" : "n",
"track_title" : "s", "track_title" : "s",
"track_number" : "i", "track_number" : "i",
"info_url" : "s", "info_url" : "s",

2
airtime_mvc/public/js/datatables/plugin/dataTables.columnFilter.js
View File

@ -190,7 +190,7 @@
} else if (th.attr('id') == "length") { } else if (th.attr('id') == "length") {
label = " hh:mm:ss.t"; label = " hh:mm:ss.t";
} else if (th.attr('id') == "sample_rate") { } else if (th.attr('id') == "sample_rate") {
label = " Hz"; label = " kHz";
} }
th.html(_fnRangeLabelPart(0)); th.html(_fnRangeLabelPart(0));