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

Merge branch 'master' of github.com:colosa/processmaker

Browse Source 
Conflicts:
	workflow/engine/classes/model/Process.php
This commit is contained in:
Erik Amaru Ortiz
2014-01-23 21:26:44 -04:00
parent f1530c41c5 86e4a3b470
commit 0f234df1db
18 changed files with 112 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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') { // Get the last valid delegation for participated list
if (($httpData->action == 'sent') || ($httpData->action == 'search')){ // Get the last valid delegation for participated list
$criteria = new Criteria();
$criteria->addSelectColumn(AppDelegationPeer::DEL_INDEX);
$criteria->add(AppDelegationPeer::APP_UID, $httpData->appUid);