fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-939

Browse Source
This commit is contained in:
Victor Saisa Lopez
2015-02-06 12:17:34 -04:00
parent f5e00b7112 4668707f8a
commit f2a00a4aeb
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/class.applications.php
View File

@@ -118,6 +118,9 @@ class Applications
case "COMPLETED":
$Criteria = $oAppCache->getCompletedListCriteria($userUid);
$CriteriaCount = $oAppCache->getCompletedCountCriteria($userUid);
$Criteria->add (AppCacheViewPeer::DEL_LAST_INDEX,"1");
$CriteriaCount->add (AppCacheViewPeer::DEL_LAST_INDEX,"1");
break;
default:
//All status

7
workflow/engine/classes/class.pmDynaform.php
View File

@@ -119,7 +119,7 @@ class pmDynaform
if (is_array($items[$key])) {
$this->mergeAppData($app_uid, $items[$key]);
} else {
if (isset($this->data[$items[$key]->name])) {
if (isset($items[$key]->var_name) && isset($this->data[$items[$key]->var_name])) {
if ($items[$key]->type === "grid") {
$rows = $this->data[$items[$key]->name];
foreach ($rows as $keyRow => $row) {
@@ -153,11 +153,14 @@ class pmDynaform
}
$items[$key]->options = $options;
}
if (isset($items[$key]->columns)) {
$this->mergeAppData($app_uid, $items[$key]->columns);
}
}
}
}
public function mergeDynContentAppData($app_uid, $items)
public function mergeDynContentAppData($app_uid, &$items)
{
$dynContent = G::json_decode($this->record["DYN_CONTENT"]);
if (isset($dynContent->items)) {