fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 6867 problem solved

Browse Source 
- there is not more validations for fields that shouldn't  have reuiqred validation
This commit is contained in:
Erik Amaru Ortiz
2011-07-26 10:42:27 -04:00
parent bdf9cda223
commit 36ed1b81c6
1 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
gulliver/system/class.form.php
View File

@@ -330,9 +330,9 @@ class Form extends XmlForm
$values["{$k}_label"] .= ($i != 0 ? '|': '') . $v->options[$value];
} else {
$query = G::replaceDataField($this->fields[$k]->sql,$newValues);
if(trim($query) == '') {
continue;
}
if(trim($query) == '') {
continue;
}
//we do the query to the external connection and we've got the label
$con = Propel::getConnection($this->fields[$k]->sqlConnection!=""?$this->fields[$k]->sqlConnection:"workflow");//use default connection workflow if connection is not defined. Same as Dynaforms
@@ -364,9 +364,9 @@ class Form extends XmlForm
$values["{$k}_label"] = $newValues["{$k}_label"] = $v->options[$newValues[$k]];
} else {
$query = G::replaceDataField($this->fields[$k]->sql,$newValues);
if(trim($query) == '') {
continue;
}
if(trim($query) == '') {
continue;
}
//we do the query to the external connection and we've got the label
$con = Propel::getConnection($this->fields[$k]->sqlConnection!=""?$this->fields[$k]->sqlConnection:"workflow");
$stmt = $con->prepareStatement($query);
@@ -484,42 +484,37 @@ class Form extends XmlForm
return $aFields;
}
/**
/**
* Function that verify the required fields without a correct value
* @author Erik Amaru Ortiz <erik@colosa.com>
* @access public
* @param array $values
* @param array $aNoRequiredByJS
* @param array $dataFields
* @param array $noRequired
* @return array/false
*/
function validateRequiredFields($values, $aNoRequiredByJS = array())
function validateRequiredFields($dataFields, $noRequired = array())
{
$rFields = Array();
$missingFields = Array();
foreach ($this->fields as $o) {
if (is_object($o) && property_exists(get_class($o), 'required')) {
if( $o->required == 1) {
if (!in_array($o->name, $aNoRequiredByJS)) {
array_push($rFields, $o->name);
}
$requiredFields = array();
$notPassedFields = array();
$skippedFieldsTypes = array('javascript', 'checkbox', 'yesno', 'submit', 'button', 'title', 'subtitle',
'button', 'submit', 'reset', 'hidden', 'link');
foreach ($this->fields as $field) {
if (is_object($field) && isset($field->required) && $field->required) {
if (!in_array($field->type, $skippedFieldsTypes)) {
array_push($requiredFields, $field->name);
}
}
}
foreach($rFields as $field){
#we verify if the requiered field is in array values,. t
if (array_key_exists($field, $values)) {
if( $values[$field] == "") {
array_push($missingFields, $field);
}
} else {
array_push($missingFields, $field);
foreach($dataFields as $dataFieldName => $dataField) {
//verify if the requiered field is in $requiredFields array
if (in_array($dataFieldName, $requiredFields) && !in_array($dataFieldName, $noRequired) && trim($dataField) == '') {
$notPassedFields[] = $dataFieldName;
}
}
if(sizeof($missingFields) != 0) {
return $missingFields;
} else {
return false;
}
return count($notPassedFields) > 0 ? $notPassedFields : false;
}
}