diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php index e5ace9f78..e9e521340 100644 --- a/workflow/engine/classes/model/ListCanceled.php +++ b/workflow/engine/classes/model/ListCanceled.php @@ -108,7 +108,7 @@ class ListCanceled extends BaseListCanceled $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'CANCELLED'); BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php index 940fd67e9..1b31f63ac 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -99,7 +99,7 @@ class ListCompleted extends BaseListCompleted $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED'); BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php index f6fae9ccf..5af573a86 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -33,7 +33,7 @@ class ListInbox extends BaseListInbox $aData = $oCase->loadCase($data["APP_UID"]); $data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']); } - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } diff --git a/workflow/engine/classes/model/ListMyInbox.php b/workflow/engine/classes/model/ListMyInbox.php index f05920126..6a29e6c48 100644 --- a/workflow/engine/classes/model/ListMyInbox.php +++ b/workflow/engine/classes/model/ListMyInbox.php @@ -27,7 +27,7 @@ class ListMyInbox extends BaseListMyInbox */ public function create($data) { - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } diff --git a/workflow/engine/classes/model/ListParticipatedHistory.php b/workflow/engine/classes/model/ListParticipatedHistory.php index a623e5f9b..804ee66d5 100644 --- a/workflow/engine/classes/model/ListParticipatedHistory.php +++ b/workflow/engine/classes/model/ListParticipatedHistory.php @@ -27,7 +27,7 @@ class ListParticipatedHistory extends BaseListParticipatedHistory */ public function create($data) { - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php index a96a209bd..63dc369b2 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -68,7 +68,7 @@ class ListParticipatedLast extends BaseListParticipatedLast return; } - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php index 08899ad07..939ae1c2e 100644 --- a/workflow/engine/classes/model/ListPaused.php +++ b/workflow/engine/classes/model/ListPaused.php @@ -117,7 +117,7 @@ class ListPaused extends BaseListPaused $oListInbox = new ListInbox(); $oListInbox->remove($data['APP_UID'], $data['DEL_INDEX']); - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php index fa8d7777a..1661c3838 100644 --- a/workflow/engine/classes/model/ListUnassigned.php +++ b/workflow/engine/classes/model/ListUnassigned.php @@ -28,7 +28,7 @@ class ListUnassigned extends BaseListUnassigned */ public function create($data) { - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; }