From 24833b046663c244ec5e8a609051d5c45e4509e3 Mon Sep 17 00:00:00 2001 From: paula Date: Fri, 6 Feb 2015 08:15:12 -0400 Subject: [PATCH 1/4] Added a validation by get the last index when the status is COMPLETED [issue Mantis 16763] --- workflow/engine/classes/class.applications.php | 2 ++ workflow/engine/methods/setup/systemInfo.php | 1 + 2 files changed, 3 insertions(+) diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php index 4473db067..98970ba8b 100755 --- a/workflow/engine/classes/class.applications.php +++ b/workflow/engine/classes/class.applications.php @@ -118,6 +118,8 @@ class Applications case "COMPLETED": $Criteria = $oAppCache->getCompletedListCriteria($userUid); $CriteriaCount = $oAppCache->getCompletedCountCriteria($userUid); + $Criteria->addAnd(AppCacheViewPeer::DEL_LAST_INDEX, "1"); + $CriteriaCount->add(AppCacheViewPeer::DEL_LAST_INDEX,"1"); break; default: //All status diff --git a/workflow/engine/methods/setup/systemInfo.php b/workflow/engine/methods/setup/systemInfo.php index 38657d8fa..dcd462e32 100644 --- a/workflow/engine/methods/setup/systemInfo.php +++ b/workflow/engine/methods/setup/systemInfo.php @@ -16,6 +16,7 @@ switch ($option) { G::RenderPage("publish", "extJs"); break; case "processInfo": + error_log("processInfo"); $oHeadPublisher = &headPublisher::getSingleton(); $oHeadPublisher->addContent("setup/dbInfo"); //Adding a html file .html $oHeadPublisher->addExtJsScript("setup/dbInfo", false); //Adding a javascript file .js From b076e36bf82586c9cf23eee8291c6263532a03ef Mon Sep 17 00:00:00 2001 From: paula Date: Fri, 6 Feb 2015 09:44:07 -0400 Subject: [PATCH 2/4] Delete error_log print --- workflow/engine/methods/setup/systemInfo.php | 1 - 1 file changed, 1 deletion(-) diff --git a/workflow/engine/methods/setup/systemInfo.php b/workflow/engine/methods/setup/systemInfo.php index dcd462e32..38657d8fa 100644 --- a/workflow/engine/methods/setup/systemInfo.php +++ b/workflow/engine/methods/setup/systemInfo.php @@ -16,7 +16,6 @@ switch ($option) { G::RenderPage("publish", "extJs"); break; case "processInfo": - error_log("processInfo"); $oHeadPublisher = &headPublisher::getSingleton(); $oHeadPublisher->addContent("setup/dbInfo"); //Adding a html file .html $oHeadPublisher->addExtJsScript("setup/dbInfo", false); //Adding a javascript file .js From 388f3b1859eb162a75c933e952a08bbc3e6842ca Mon Sep 17 00:00:00 2001 From: paula Date: Fri, 6 Feb 2015 10:11:27 -0400 Subject: [PATCH 3/4] Added a validation by get the last index when the status is COMPLETED --- workflow/engine/classes/class.applications.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php index 98970ba8b..a25af44ef 100755 --- a/workflow/engine/classes/class.applications.php +++ b/workflow/engine/classes/class.applications.php @@ -118,8 +118,9 @@ class Applications case "COMPLETED": $Criteria = $oAppCache->getCompletedListCriteria($userUid); $CriteriaCount = $oAppCache->getCompletedCountCriteria($userUid); - $Criteria->addAnd(AppCacheViewPeer::DEL_LAST_INDEX, "1"); - $CriteriaCount->add(AppCacheViewPeer::DEL_LAST_INDEX,"1"); + + $Criteria->add (AppCacheViewPeer::DEL_LAST_INDEX,"1"); + $CriteriaCount->add (AppCacheViewPeer::DEL_LAST_INDEX,"1"); break; default: //All status From 3953b873509da50d56072bdd72e95f7a8775327b Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 6 Feb 2015 11:11:59 -0400 Subject: [PATCH 4/4] IMPROVEMENT add options columns in grid to pmDynaform --- workflow/engine/classes/class.pmDynaform.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php index d9a239653..13c12e315 100644 --- a/workflow/engine/classes/class.pmDynaform.php +++ b/workflow/engine/classes/class.pmDynaform.php @@ -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)) {