fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-2852

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-03-14 12:38:21 -04:00
parent 734cbb58d5
commit 67b364a38c
2 changed files with 767 additions and 1213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
View File

@@ -571,6 +571,14 @@ class Consolidated
$required = (isset($field->required))? $field->required : null; $required = (isset($field->required))? $field->required : null;
$validate = (isset($field->validate))? strtolower($field->validate) : null; $validate = (isset($field->validate))? strtolower($field->validate) : null;
if (isset($field->options) && !isset($field->storeData)) {
$options = [];
foreach ($field->options as $keyField => $valueField) {
$options[] = [$keyField, $valueField];
}
$field->storeData = G::json_encode($options);
}
$fieldReadOnly = ($readOnly . "" == "1" || $readOnly == 'view')? "readOnly: true," : null; $fieldReadOnly = ($readOnly . "" == "1" || $readOnly == 'view')? "readOnly: true," : null;
$fieldRequired = ($required . "" == "1")? "allowBlank: false," : null; $fieldRequired = ($required . "" == "1")? "allowBlank: false," : null;
$fieldValidate = ($validate == "alpha" || $validate == "alphanum" || $validate == "email" || $validate == "int" || $validate == "real")? "vtype: \"$validate\"," : null; $fieldValidate = ($validate == "alpha" || $validate == "alphanum" || $validate == "email" || $validate == "int" || $validate == "real")? "vtype: \"$validate\"," : null;

1972
workflow/engine/templates/cases/casesListConsolidated.js
View File

File diff suppressed because it is too large Load Diff