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

bpmn designer, validation for actors assigment was added,

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2011-02-28 19:25:01 +00:00
parent 98b60b2e37
commit 5f34a2469a
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
workflow/engine/classes/model/TaskUser.php
View File

@@ -49,19 +49,10 @@ class TaskUser extends BaseTaskUser {
{ {
$oConnection = Propel::getConnection(TaskUserPeer::DATABASE_NAME); $oConnection = Propel::getConnection(TaskUserPeer::DATABASE_NAME);
try { try {
//delete old TaskUserPeer Rows, because is not safe insert previous verify old rows. $taskUser = TaskUserPeer::retrieveByPK($aData['TAS_UID'], $aData['USR_UID'], $aData['TU_TYPE'], $aData['TU_RELATION']);
$criteria = new Criteria('workflow');
$criteria->add(TaskUserPeer::TAS_UID, $aData['TAS_UID'] ); if( is_object($taskUser) )
$criteria->add(TaskUserPeer::USR_UID, $aData['USR_UID'] ); return -1;
$criteria->add(TaskUserPeer::TU_TYPE, $aData['TU_TYPE'] );
$criteria->add(TaskUserPeer::TU_RELATION, $aData['TU_RELATION'] );
$objects = TaskUserPeer::doSelect($criteria, $oConnection);
$oConnection->begin();
foreach($objects as $row) {
$this->remove($row->getTasUid(), $row->getUsrUid(), $row->getTuType(), $row->getTuRelation() );
}
$oConnection->commit();
$oTaskUser = new TaskUser(); $oTaskUser = new TaskUser();
$oTaskUser->fromArray($aData, BasePeer::TYPE_FIELDNAME); $oTaskUser->fromArray($aData, BasePeer::TYPE_FIELDNAME);

19
workflow/engine/controllers/processProxy.php
View File

@@ -156,17 +156,24 @@ class ProcessProxy extends HttpProxyController
foreach( $UIDS as $UID ) { foreach( $UIDS as $UID ) {
if ($param->TU_RELATION == '1' ) if ($param->TU_RELATION == '1' )
$oTaskUser->create(array('TAS_UID' => $TAS_UID, 'USR_UID' => $UID, 'TU_TYPE' => $TU_TYPE, 'TU_RELATION' => 1)); $res[] = $oTaskUser->create(array('TAS_UID' => $TAS_UID, 'USR_UID' => $UID, 'TU_TYPE' => $TU_TYPE, 'TU_RELATION' => 1));
else else
$oTaskUser->create(array('TAS_UID' => $TAS_UID, 'USR_UID' => $UID, 'TU_TYPE' => $TU_TYPE, 'TU_RELATION' => 2)); $res[] = $oTaskUser->create(array('TAS_UID' => $TAS_UID, 'USR_UID' => $UID, 'TU_TYPE' => $TU_TYPE, 'TU_RELATION' => 2));
} }
$task = TaskPeer::retrieveByPk($TAS_UID); $task = TaskPeer::retrieveByPk($TAS_UID);
$this->success = true; $this->success = true;
if( count($UIDS) > 1 ) if( ! in_array('-1', $res) ) {
$this->msg = __('ID_ACTORS_ASSIGNED_SUCESSFULLY', SYS_LANG, Array(count($UIDS), $task->getTasTitle())); if( count($UIDS) == 1 )
else $this->msg = __('ID_ACTOR_ASSIGNED_SUCESSFULLY', SYS_LANG, Array('tas_title'=>$task->getTasTitle()));
$this->msg = __('ID_ACTOR_ASSIGNED_SUCESSFULLY', SYS_LANG, Array('tas_title'=>$task->getTasTitle())); else
$this->msg = __('ID_ACTORS_ASSIGNED_SUCESSFULLY', SYS_LANG, Array(count($UIDS), $task->getTasTitle()));
} else {
if( count($UIDS) == 1 )
$this->msg = __('ID_ACTOR_ALREADY_ASSIGNED', SYS_LANG, Array( $task->getTasTitle()));
else
$this->msg = __('ID_SOME_ACTORS_ALREADY_ASSIGNED', SYS_LANG, Array( $task->getTasTitle()));
}
} }
/** /**