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

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

This commit is contained in:
Martin Konecny 2012-08-22 16:08:58 -04:00
parent 442c156458 6fec9b0301
commit b506c37341
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/forms/SmartBlockCriteria.php
View File

@ -4,7 +4,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
private $criteriaOptions = array( private $criteriaOptions = array(
0 => "Select criteria", 0 => "Select criteria",
"album_title" => "Album", "album_title" => "Album",
"bit_rate" => "Bit Rate", "bit_rate" => "Bit Rate (Kbps)",
"bpm" => "Bpm", "bpm" => "Bpm",
"comments" => "Comments", "comments" => "Comments",
"composer" => "Composer", "composer" => "Composer",
@ -23,7 +23,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
"name" => "Name", "name" => "Name",
"orchestra" => "Orchestra", "orchestra" => "Orchestra",
"rating" => "Rating", "rating" => "Rating",
"sample_rate" => "Sample Rate", "sample_rate" => "Sample Rate (kHz)",
"track_title" => "Title", "track_title" => "Title",
"track_number" => "Track Number", "track_number" => "Track Number",
"utime" => "Uploaded", "utime" => "Uploaded",

4
airtime_mvc/application/models/Block.php
View File

@ -1162,7 +1162,7 @@ EOT;
$spCriteria = 'date('.$spCriteria.')'; $spCriteria = 'date('.$spCriteria.')';
$spCriteriaValue = substr($spCriteriaValue, 0, 10); $spCriteriaValue = substr($spCriteriaValue, 0, 10);
} }
} else if($spCriteria == "bit_rate") { } else if($spCriteria == "bit_rate" || $spCriteria == 'sample_rate') {
// multiply 1000 because we store only number value // multiply 1000 because we store only number value
// e.g 192kps is stored as 192000 // e.g 192kps is stored as 192000
$spCriteriaValue = $criteria['value']*1000; $spCriteriaValue = $criteria['value']*1000;
@ -1177,7 +1177,7 @@ EOT;
} else if ($spCriteriaModifier == "contains" || $spCriteriaModifier == "does not contain") { } else if ($spCriteriaModifier == "contains" || $spCriteriaModifier == "does not contain") {
$spCriteriaValue = "%$spCriteriaValue%"; $spCriteriaValue = "%$spCriteriaValue%";
} else if ($spCriteriaModifier == "is in the range") { } else if ($spCriteriaModifier == "is in the range") {
$spCriteriaValue = "$spCriteria > '$spCriteriaValue' AND $spCriteria <= '$criteria[extra]'"; $spCriteriaValue = "$spCriteria >= '$spCriteriaValue' AND $spCriteria <= '$criteria[extra]'";
} }
$spCriteriaModifier = self::$modifier2CriteriaMap[$spCriteriaModifier]; $spCriteriaModifier = self::$modifier2CriteriaMap[$spCriteriaModifier];