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

BUG 6900 "Solved the validation on field email in dynaform" fixes!!

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2011-06-10 19:31:15 -04:00
parent 61b3aad877
commit 42fcf9ce88
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gulliver/system/class.xmlform.php
View File

@@ -1159,7 +1159,7 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
$formVariableKeyValue = ''; $formVariableKeyValue = '';
G::LoadClass('case'); G::LoadClass('case');
$oApp= new Cases(); $oApp= new Cases();
if ($oApp->loadCase($_SESSION['APPLICATION'])!=null){ if ($_SESSION['APPLICATION'] != null && $oApp->loadCase($_SESSION['APPLICATION'])!=null){
$aFields = $oApp->loadCase($_SESSION['APPLICATION']); $aFields = $oApp->loadCase($_SESSION['APPLICATION']);
if(isset($aFields['APP_DATA'][$this->name . '_label'])){ if(isset($aFields['APP_DATA'][$this->name . '_label'])){
$formVariableValue = $aFields['APP_DATA'][$this->name . '_label']; $formVariableValue = $aFields['APP_DATA'][$this->name . '_label'];
@@ -2564,6 +2564,8 @@ class XmlForm_Field_Dropdown extends XmlForm_Field {
*/ */
function render($value = NULL, $owner = NULL, $rowId = '', $onlyValue = false, $row = -1, $therow = -1) function render($value = NULL, $owner = NULL, $rowId = '', $onlyValue = false, $row = -1, $therow = -1)
{ {
$displayStyle = '';
//Returns value from a PMTable when it is exists. //Returns value from a PMTable when it is exists.
if (($this->pmconnection != '') && ($this->pmfield != '') && $value == NULL) { if (($this->pmconnection != '') && ($this->pmfield != '') && $value == NULL) {
$value = $this->getPMTableValue($owner); $value = $this->getPMTableValue($owner);
@@ -2584,9 +2586,7 @@ class XmlForm_Field_Dropdown extends XmlForm_Field {
if ($this->renderMode == '') $this->renderMode = $this->mode; if ($this->renderMode == '') $this->renderMode = $this->mode;
if (!$onlyValue){ //Render Field if not defined onlyValue if (!$onlyValue){ //Render Field if not defined onlyValue
if ($this->renderMode == 'edit') { //EDIT MODE if ($this->renderMode != 'edit') { //EDIT MODE
$displayStyle = '';
} else {
$displayStyle = 'display:none;'; $displayStyle = 'display:none;';
} }
$readOnlyField = ($this->readonly == 1 || $this->readonly == '1') ? 'disabled' : ''; $readOnlyField = ($this->readonly == 1 || $this->readonly == '1') ? 'disabled' : '';
@@ -4159,11 +4159,11 @@ class XmlForm
} }
else { else {
$isEditMode = isset($xmlNode[$k]->attributes['mode']) && $xmlNode[$k]->attributes['mode'] == 'view' ? false: true; $isEditMode = isset($xmlNode[$k]->attributes['mode']) && $xmlNode[$k]->attributes['mode'] == 'view' ? false: true;
if ($xmlNode [$k]->attributes ['validate'] == "Email" && $isEditMode && $this->mode != 'view') { if (isset($xmlNode[$k]->attributes['validate']) && $xmlNode[$k]->attributes ['validate'] == "Email" && $isEditMode && $this->mode !=
'view') {
$this->requiredFields [] = array ('name' => $field->name, 'type' => $xmlNode [$k]->attributes ['type'], 'label' => trim ( $field->label ), 'validate' => trim ( $field->validate ),'required' => trim ( $field->required ) ); $this->requiredFields [] = array ('name' => $field->name, 'type' => $xmlNode [$k]->attributes ['type'], 'label' => trim ( $field->label ), 'validate' => trim ( $field->validate ),'required' => trim ( $field->required ) );
} }
} }
} }
} }