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

Merged in paulis/processmaker/PM-4315 (pull request #3337)

Browse Source 
PM-4315
This commit is contained in:
Julio Cesar Laura Avendaño
2015-12-09 11:58:23 -04:00
parent e4f6671248 d2852175b6
commit 01c94e54ad
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/ListInbox.php
View File

@@ -24,7 +24,7 @@ class ListInbox extends BaseListInbox
*
*/
public function create($data, $isSelfService = false)
{
{
$con = Propel::getConnection( ListInboxPeer::DATABASE_NAME );
try {
if(isset($data['APP_TITLE'])) {

10
workflow/engine/classes/model/ListParticipatedLast.php
View File

@@ -170,26 +170,24 @@ class ListParticipatedLast extends BaseListParticipatedLast
$criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid);
$criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid);
$criteria->add(ListParticipatedLastPeer::DEL_INDEX, $del_index);
if(!$this->isTheOne($app_uid, $usr_uid) || $force) {
$result = ListParticipatedLastPeer::doDelete($criteria);
$flagDelete = true;
}
$flagDelete = true;
} else {
$criteria = new Criteria("workflow");
$criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid);
$criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid);
$rsCriteria = ListParticipatedLastPeer::doSelectRS($criteria);
if ($rsCriteria->next()) {
$criteria2 = clone $criteria;
if(!$this->isTheOne($app_uid, $usr_uid) || $force) {
if(!$this->isTheOne($app_uid, $usr_uid) || $force) {
$result = ListParticipatedLastPeer::doDelete($criteria2);
$flagDelete = true;
}
$flagDelete = true;
}
}