diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php index f18d0effb..97410fe81 100755 --- a/workflow/engine/classes/class.applications.php +++ b/workflow/engine/classes/class.applications.php @@ -408,7 +408,7 @@ class Applications //Check also $distinct in the method getListCounters(), this in AppCacheView.php $distinct = true; - if (($action == "todo" || $action == "selfservice" || $action == "unassigned" || $action == "to_reassign" || $action == "to_revise") || ($status == "TO_DO")) { + if (($action == "search" || $action == "todo" || $action == "selfservice" || $action == "unassigned" || $action == "to_reassign" || $action == "to_revise") || ($status == "TO_DO")) { $distinct = false; } diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php index d45942e00..a50bfb18e 100755 --- a/workflow/engine/classes/model/AppCacheView.php +++ b/workflow/engine/classes/model/AppCacheView.php @@ -1053,8 +1053,7 @@ class AppCacheView extends BaseAppCacheView if (!$doCount) { //Completed - getCompleted() $criteria->addGroupByColumn(AppCacheViewPeer::APP_UID); - - //$criteria->addGroupByColumn(AppCacheViewPeer::USR_UID); + $criteria->addGroupByColumn(AppCacheViewPeer::DEL_INDEX); } return $criteria; diff --git a/workflow/engine/controllers/appProxy.php b/workflow/engine/controllers/appProxy.php index 59bd6fff6..b9e985a8a 100644 --- a/workflow/engine/controllers/appProxy.php +++ b/workflow/engine/controllers/appProxy.php @@ -181,7 +181,7 @@ class AppProxy extends HttpProxyController throw new Exception( G::LoadTranslation( 'ID_NO_PERMISSION_NO_PARTICIPATED' ) ); } - if (($httpData->action == 'sent') || ($httpData->action == 'search')){ // Get the last valid delegation for participated list + if ($httpData->action == 'sent') { // Get the last valid delegation for participated list $criteria = new Criteria(); $criteria->addSelectColumn(AppDelegationPeer::DEL_INDEX); $criteria->add(AppDelegationPeer::APP_UID, $httpData->appUid); diff --git a/workflow/engine/methods/cases/cases_Open.php b/workflow/engine/methods/cases/cases_Open.php index 142efb77a..cfa30701a 100755 --- a/workflow/engine/methods/cases/cases_Open.php +++ b/workflow/engine/methods/cases/cases_Open.php @@ -185,7 +185,11 @@ try { $row = $rs->getRow(); $_SESSION['APPLICATION'] = $sAppUid; - $_SESSION['INDEX'] = $row['DEL_INDEX']; + if($_action=='search'){ + $_SESSION['INDEX'] = $iDelIndex; + } else { + $_SESSION['INDEX'] = $row['DEL_INDEX']; + } $_SESSION['PROCESS'] = $aFields['PRO_UID']; $_SESSION['TASK'] = - 1; //$Fields = $oCase->loadCase( $_SESSION['APPLICATION'], $_SESSION['INDEX'] );