fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 5140 "Formula is not working in master dynaforms" SOLVED

Browse Source 
- Not taken into account the attribute "Decimal Separator" for the
  execution of a formula in master DynaForms
- When entering data in a Currency/Percentage field is added spaces
  at the beginning (when the field is in a formula)
- Problem solved, has joined the attribute "Decimal Separator" to
  evaluate the formula
- It has rewritten the algorithm for the formula evaluation
* Available from version 2.0.44
This commit is contained in:
Victor Saisa Lopez
2012-09-19 12:26:44 -04:00
parent 4cd0ba210e
commit 933dced14b
3 changed files with 152 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

292
gulliver/js/form/core/form.js
View File

File diff suppressed because it is too large Load Diff

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

@@ -1013,7 +1013,7 @@ class XmlForm_Field_Text extends XmlForm_Field_SimpleText
$html .= 'onkeypress="'.$this->htmlentities($onkeypress, ENT_COMPAT, 'utf-8').'" ';
$html .= $this->NSDefaultValue().' ';
$html .= $this->NSRequiredValue().' ';
$html .= 'pm:decimal_separator="' + $this->comma_separator + '" ';
$html .= 'pm:decimal_separator="' . $this->comma_separator . '" ';
$html .= '/>';
}else{ //VIEW MODE
$html .= $this->htmlentities($value, ENT_QUOTES, 'utf-8');
@@ -1713,7 +1713,7 @@ class XmlForm_Field_Currency extends XmlForm_Field_SimpleText {
$html .= $this->NSDefaultValue().' ';
$html .= $this->NSRequiredValue().' ';
$html .= $this->NSGridType().' ';
$html .= 'pm:decimal_separator="'.$this->comma_separator.'" ';
$html .= 'pm:decimal_separator="' . $this->comma_separator . '" ';
$html .= '/>';
}else{ //VIEW MODE
$html .= $this->htmlentities($value, ENT_COMPAT, 'utf-8');
@@ -1829,7 +1829,7 @@ class XmlForm_Field_Percentage extends XmlForm_Field_SimpleText {
$html .= 'onkeypress="'.$this->htmlentities($onkeypress, ENT_COMPAT, 'utf-8').'" ';
$html .= $this->NSDefaultValue().' ';
$html .= $this->NSRequiredValue().' ';
$html .= 'pm:decimal_separator="' + $this->comma_separator + '" ';
$html .= 'pm:decimal_separator="' . $this->comma_separator . '" ';
$html .= '/>';
}else{ //VIEW MODE
$html .= $this->htmlentities($value, ENT_COMPAT, 'utf-8');

5
workflow/engine/controllers/main.php
View File

@@ -192,7 +192,10 @@ class Main extends Controller
$availableLangArray = $this->getLanguagesList();
G::LoadClass ('serverConfiguration');
G::LoadClass("serverConfiguration");
$sflag = 0;
if (($nextBeatDate = $this->memcache->get('nextBeatDate')) === false) {
//get the serverconf singleton, and check if we can send the heartbeat
$oServerConf = & serverConf::getSingleton ();