fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in gproly/processmaker/PM-4141 (pull request #3290)

Browse Source 
PM-4141
This commit is contained in:
Julio Cesar Laura Avendaño
2015-12-03 15:35:25 -04:00
parent 9cc0377309 28b6838770
commit b50553a036
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/classes/class.reportTables.php
View File

@@ -553,6 +553,15 @@ class ReportTables
public function updateTables ($sProcessUid, $sApplicationUid, $iApplicationNumber, $aFields) public function updateTables ($sProcessUid, $sApplicationUid, $iApplicationNumber, $aFields)
{ {
try { try {
$c = new Criteria('workflow');
$c->addSelectColumn(BpmnProjectPeer::PRJ_UID);
$c->add(BpmnProjectPeer::PRJ_UID, $sProcessUid, Criteria::EQUAL);
$ds = ProcessPeer::doSelectRS($c);
$ds->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$ds->next();
$row = $ds->getRow();
$isBpmn = isset($row['PRJ_UID']);
if (!class_exists('ReportTablePeer')) { if (!class_exists('ReportTablePeer')) {
require_once 'classes/model/ReportTablePeer.php'; require_once 'classes/model/ReportTablePeer.php';
} }
@@ -583,7 +592,7 @@ class ReportTables
foreach ($aTableFields as $aField) { foreach ($aTableFields as $aField) {
$sQuery .= '`' . $aField['sFieldName'] . '` = '; $sQuery .= '`' . $aField['sFieldName'] . '` = ';
if(!isset($aFields[$aField['sFieldName']])){ if(!$isBpmn && !isset($aFields[$aField['sFieldName']])){
foreach($aFields as $row){ foreach($aFields as $row){
if(is_array($row) && isset($row[count($row)])){ if(is_array($row) && isset($row[count($row)])){
$aFields = $row[count($row)]; $aFields = $row[count($row)];

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

@@ -458,8 +458,8 @@ class Consolidated
$dataTask = $oDyna->load($dyn_uid); $dataTask = $oDyna->load($dyn_uid);
if ($dataTask['DYN_VERSION'] > 0) { if ($dataTask['DYN_VERSION'] > 0) {
G::LoadClass("pmDynaform"); G::LoadClass("pmDynaform");
$pmDyna = new \pmDynaform(array('APP_DATA' => array())); $_SESSION['PROCESS'] = $pro_uid;
$pmDyna->fields["CURRENT_DYNAFORM"] = $dyn_uid; $pmDyna = new \pmDynaform(array('APP_DATA' => array(), "CURRENT_DYNAFORM" => $dyn_uid));
$json = G::json_decode($dataTask["DYN_CONTENT"]); $json = G::json_decode($dataTask["DYN_CONTENT"]);
$pmDyna->jsonr($json); $pmDyna->jsonr($json);
$fieldsDyna = $json->items[0]->items; $fieldsDyna = $json->items[0]->items;