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

CC-84: Smart Playlists

Browse source 
- improved validation to not allow multiple criteria fields
This commit is contained in:
denise 2012-07-30 17:03:01 -04:00
parent f91be9468f
commit d169f4aa31
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -892,12 +892,16 @@ EOT;
$errors[] = array("element"=>"sp_limit_value", "msg"=>$error); $errors[] = array("element"=>"sp_limit_value", "msg"=>$error);
} }
$criteriaFieldsUsed = array();
foreach ($data['criteria'] as $key=>$d){ foreach ($data['criteria'] as $key=>$d){
$error = array(); $error = array();
// check for not selected select box // check for not selected select box
if ($d['sp_criteria_field'] == "0" || $d['sp_criteria_modifier'] == "0"){ if ($d['sp_criteria_field'] == "0" || $d['sp_criteria_modifier'] == "0"){
$error[] = "You must select Criteria and Modifier"; $error[] = "You must select Criteria and Modifier";
} else if (in_array($d['sp_criteria_field'], $criteriaFieldsUsed)) {
$error[] = "Criteria fields can only be used once";
} else { } else {
array_push($criteriaFieldsUsed, $d['sp_criteria_field']);
$column = CcFilesPeer::getTableMap()->getColumnByPhpName(self::$criteria2PeerMap[$d['sp_criteria_field']]); $column = CcFilesPeer::getTableMap()->getColumnByPhpName(self::$criteria2PeerMap[$d['sp_criteria_field']]);
// validation on type of column // validation on type of column
if ($d['sp_criteria_field'] == 'length') { if ($d['sp_criteria_field'] == 'length') {

2
airtime_mvc/public/css/styles.css
View file

@ -1494,7 +1494,7 @@ div.errors, span.errors{
} }
span.errors.sp-errors{ span.errors.sp-errors{
width: 466px; width: 492px;
display: block; display: block;
} }