fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of git://github.com/colosa/processmaker into BUG-0000

Browse Source
This commit is contained in:
Victor Saisa Lopez
2013-04-24 16:01:04 -04:00
parent 899c3b4cc5 964ea4ac80
commit 5c21501aea
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.pmScript.php
View File

@@ -340,6 +340,8 @@ class PMScript
} else { } else {
if (!isset($this->aFields[$aMatch[2][$i][0]])) { if (!isset($this->aFields[$aMatch[2][$i][0]])) {
eval("\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . " = '';"); eval("\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . " = '';");
} else {
eval("if (!isset(\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . ")) {\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . " = '';}");
} }
} }
$sAux = substr( $this->sScript, $iAux, $aMatch[0][$i][1] - $iAux ); $sAux = substr( $this->sScript, $iAux, $aMatch[0][$i][1] - $iAux );

5
workflow/engine/templates/setup/environmentSettings.js
View File

@@ -23,8 +23,7 @@ Ext.onReady(function() {
items: [ items: [
{xtype: 'label', fieldLabel: _('IS_USER_NAME_DISPLAY_FORMAT'), id: 'lblFullName', width: 400}, {xtype: 'label', fieldLabel: _('IS_USER_NAME_DISPLAY_FORMAT'), id: 'lblFullName', width: 400},
{xtype: 'label', fieldLabel: _('ID_GLOBAL_DATE_FORMAT'), id: 'lblDateFormat', width: 400}, {xtype: 'label', fieldLabel: _('ID_GLOBAL_DATE_FORMAT'), id: 'lblDateFormat', width: 400},
{xtype: 'label', fieldLabel: _('ID_CASE_LIST') +': '+_('ID_CASES_DATE_MASK'), id: 'lblCasesDateFormat', width: 400} {xtype: 'label', fieldLabel: _('ID_CASE_LIST') +': '+_('ID_CASES_DATE_MASK'), id: 'lblCasesDateFormat', width: 400}//,
//,
//{xtype: "label", fieldLabel: _("ID_CASE_LIST") + ": " +_("ID_CASES_ROW_NUMBER"), id: "lblCasesRowsList", width: 400}, //{xtype: "label", fieldLabel: _("ID_CASE_LIST") + ": " +_("ID_CASES_ROW_NUMBER"), id: "lblCasesRowsList", width: 400},
//{xtype: "label", fieldLabel: _("ID_CASE_LIST") + ": " + _("ID_REFRESH_TIME_SECONDS"), id: "lblCasesRefreshTime", width: 400} //{xtype: "label", fieldLabel: _("ID_CASE_LIST") + ": " + _("ID_REFRESH_TIME_SECONDS"), id: "lblCasesRefreshTime", width: 400}
] ]
@@ -97,6 +96,7 @@ Ext.onReady(function() {
cmbDateFormat = new Ext.form.ComboBox({ cmbDateFormat = new Ext.form.ComboBox({
fieldLabel : _('ID_GLOBAL_DATE_FORMAT'), fieldLabel : _('ID_GLOBAL_DATE_FORMAT'),
hiddenName : 'dateFormat', hiddenName : 'dateFormat',
width: 330,
store : storeDateFormat, store : storeDateFormat,
mode: 'remote', mode: 'remote',
valueField : 'id', valueField : 'id',
@@ -143,6 +143,7 @@ Ext.onReady(function() {
cmbCasesDateFormat = new Ext.form.ComboBox({ cmbCasesDateFormat = new Ext.form.ComboBox({
fieldLabel : _('ID_CASES_DATE_MASK'), fieldLabel : _('ID_CASES_DATE_MASK'),
hiddenName : 'casesListDateFormat', hiddenName : 'casesListDateFormat',
width: 330,
store : storeCasesDateFormat, store : storeCasesDateFormat,
valueField : 'id', valueField : 'id',
displayField : 'name', displayField : 'name',