this bug 5932 was solved

This commit is contained in:
Carlos Pacha
2011-02-11 16:25:28 +00:00
parent 36536fb678
commit 0b38108aa2
2 changed files with 5 additions and 2 deletions

View File

@@ -1406,6 +1406,7 @@ function showRow( element ){
var row=getRow(element);
requiredFields = [];
sRequiredFields = document.getElementById('DynaformRequiredFields').value.replace(/%27/gi, '"');
sRequiredFields = document.getElementById('DynaformRequiredFields').value.replace(/%39/gi, "'");
fields = new String(sRequiredFields);
fields = stripslashes(fields);
@@ -1604,7 +1605,9 @@ var validateForm = function(sRequiredFields) {
if( typeof(sRequiredFields) != 'object' || sRequiredFields.indexOf("%27") > 0 ){
sRequiredFields = sRequiredFields.replace(/%27/gi, '"');
}
if( typeof(sRequiredFields) != 'object' || sRequiredFields.indexOf("%39") > 0 ){
sRequiredFields = sRequiredFields.replace(/%39/gi, "'");
}
aRequiredFields = eval(sRequiredFields);
var sMessage = '';

View File

@@ -3778,7 +3778,7 @@ class XmlForm
}
//var_dump($this->requiredFields);
$oJSON = new Services_JSON ( );
$this->objectRequiredFields = str_replace('"', "%27", $oJSON->encode ( $this->requiredFields ));
$this->objectRequiredFields = str_replace('"', "%27", str_replace("'", "%39", $oJSON->encode ( $this->requiredFields )) );
//Load the default values
//$this->setDefaultValues();