Merged in bugfix/HOR-2852 (pull request #5527)

HOR-2852

Approved-by: Julio Cesar Laura Avendaño

workflow/engine/methods/cases/casesConsolidatedListExtJs.php

@@ -59,32 +59,17 @@ while ($rsSql->next()) {
 
     $grdTitle = htmlentities($proTitle . " / " . $tabTitle, ENT_QUOTES, "UTF-8");
     $tabTitle = htmlentities(substr($proTitle, 0, 25) . ((strlen($proTitle) > 25) ? "..." : null) . " / " . $tabTitle, ENT_QUOTES, "UTF-8");
-
-    $oProcess = new Process();
-    $isBpmn = $oProcess->isBpmnProcess($processUid);
-    if ($isBpmn) {
-        $arrayTabItem[] = "
-        {
-            title: \"<span onmouseover=\\\"toolTipTab('$grdTitle', 1);\\\" onmouseout=\\\"toolTipTab('', 0);\\\">$tabTitle</span>\",
-            listeners: {
-                activate: function ()
-                {
-                      generateGrid(\"$processUid\", \"$taskUid\", \"$dynaformUid\");
-                }
+    
+    $arrayTabItem[] = "
+    {
+        title: \"<span onmouseover=\\\"toolTipTab('$grdTitle', 1);\\\" onmouseout=\\\"toolTipTab('', 0);\\\">$tabTitle</span>\",
+        listeners: {
+            activate: function ()
+            {
+                  generateGrid(\"$processUid\", \"$taskUid\", \"$dynaformUid\");
             }
-        }";
-    } else {
-        $arrayTabItem[] = "
-        {
-            title: \"<span onmouseover=\\\"toolTipTab('$grdTitle', 1);\\\" onmouseout=\\\"toolTipTab('', 0);\\\">$tabTitle</span>\",
-            listeners: {
-                activate: function ()
-                {
-                      generateGridClassic(\"$processUid\", \"$taskUid\", \"$dynaformUid\");
-                }
-            }
-        }";
-    }
+        }
+    }";
 }
 
 if (count($arrayTabItem) > 0) {

workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php

@@ -570,8 +570,16 @@ class Consolidated
             $readOnly = (isset($field->readOnly))? $field->readOnly : null;
             $required = (isset($field->required))? $field->required : 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" || $field->readOnly == 'view')? "readOnly: true," : null;
+            $fieldReadOnly = ($readOnly . "" == "1" || $readOnly == 'view')? "readOnly: true," : null;
             $fieldRequired = ($required . "" == "1")? "allowBlank: false," : null;
             $fieldValidate = ($validate == "alpha" || $validate == "alphanum" || $validate == "email" || $validate == "int" || $validate == "real")? "vtype: \"$validate\"," : null;