fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #2378 from norahmollo/BUG-13829

Browse Source 
BUG-13829 Advanced Search current User column no muestra el Dato correcto
This commit is contained in:
julceslauhub
2014-05-12 14:16:47 -03:00
parent 59f1846976 15ce8e997a
commit bf50a6a9c8
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}

3
workflow/engine/classes/model/AppCacheView.php
View File

@@ -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;

2
workflow/engine/controllers/appProxy.php
View File

@@ -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);

6
workflow/engine/methods/cases/cases_Open.php
View File

@@ -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'] );