fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in darojas/processmaker (pull request #110)

Browse Source 
Se agregan BEHAT para PROJECT USERS, se agregan validaciones de mensajes en mensajes de error. Valdaciones para ASSIGNEE
This commit is contained in:
erik ao
2014-01-24 17:56:50 -04:00
parent 71812e4b50 9e19a0185a
commit 9299ba66c8
5 changed files with 101 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/src/BusinessModel/ProjectUser.php
View File

@@ -223,7 +223,7 @@ class ProjectUser
$oCriteria->add( \UsersPeer::USR_USERNAME, $sWS_USER );
$userIsAssigned = \GroupUserPeer::doCount( $oCriteria );
if (! ($userIsAssigned >= 1)) {
$messageCode = "The User `" . $sWS_USER . "` doesn't have the activity `" . $sTASKS . "` assigned";
throw (new \Exception( "The User `" . $sWS_USER . "` doesn't have the activity `" . $sTASKS . "` assigned"));
}
}
$oDataset = \TaskUserPeer::doSelectRS($oCriteria);
@@ -237,7 +237,7 @@ class ProjectUser
$oDataset->next();
}
} else {
$messageCode = $result->message;
throw (new \Exception( $result->message));
}
return $messageCode;
} catch (Exception $e) {

56
workflow/engine/src/BusinessModel/Task.php
View File

@@ -651,7 +651,7 @@ class Task
$oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL);
if ($filter) {
if ($filter || $filter=='0') {
$oCriteria->add( $oCriteria->getNewCriterion( \UsersPeer::USR_USERNAME, "%$filter%", \Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( \UsersPeer::USR_FIRSTNAME, "%$filter%", \Criteria::LIKE ) )->addOr( $oCriteria->getNewCriterion( \UsersPeer::USR_LASTNAME, "%$filter%", \Criteria::LIKE ) ) );
}
$oCriteria->addSelectColumn(\TaskUserPeer::TAS_UID);
@@ -663,10 +663,18 @@ class Task
$oCriteria->add(\TaskUserPeer::TU_TYPE, 1);
$oCriteria->add(\TaskUserPeer::TU_RELATION, 1);
if ($start) {
$oCriteria->setOffset( $start );
if ($start < 0) {
throw (new \Exception( 'invalid value specified for `start`.'));
} else {
$oCriteria->setOffset( $start );
}
}
if ($limit) {
$oCriteria->setLimit( $limit );
if ($limit < 0) {
throw (new \Exception( 'invalid value specified for `limit`.'));
} else {
$oCriteria->setLimit( $limit );
}
}
$oDataset = \TaskUserPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
@@ -762,16 +770,24 @@ class Task
$oCriteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL);
if ($filter) {
if ($filter || $filter=='0') {
$oCriteria->add( $oCriteria->getNewCriterion( \UsersPeer::USR_USERNAME, "%$filter%", \Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( \UsersPeer::USR_FIRSTNAME, "%$filter%", \Criteria::LIKE ) )->addOr( $oCriteria->getNewCriterion( \UsersPeer::USR_LASTNAME, "%$filter%", \Criteria::LIKE ) ) );
}
$oCriteria->add(\UsersPeer::USR_STATUS, 'ACTIVE');
$oCriteria->add(\UsersPeer::USR_UID, $aUIDS2, \Criteria::NOT_IN);
if ($start) {
$oCriteria->setOffset( $start );
if ($start < 0) {
throw (new \Exception( 'invalid value specified for `start`.'));
} else {
$oCriteria->setOffset( $start );
}
}
if ($limit) {
$oCriteria->setLimit( $limit );
if ($limit < 0) {
throw (new \Exception( 'invalid value specified for `limit`.'));
} else {
$oCriteria->setLimit( $limit );
}
}
$oDataset = \UsersPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
@@ -1090,7 +1106,7 @@ class Task
$oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL);
if ($filter) {
if ($filter || $filter=='0') {
$oCriteria->add( $oCriteria->getNewCriterion( \UsersPeer::USR_USERNAME, "%$filter%", \Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( \UsersPeer::USR_FIRSTNAME, "%$filter%", \Criteria::LIKE ) )->addOr( $oCriteria->getNewCriterion( \UsersPeer::USR_LASTNAME, "%$filter%", \Criteria::LIKE ) ) );
}
$oCriteria->addSelectColumn(\TaskUserPeer::TAS_UID);
@@ -1102,10 +1118,18 @@ class Task
$oCriteria->add(\TaskUserPeer::TU_TYPE, 2);
$oCriteria->add(\TaskUserPeer::TU_RELATION, 1);
if ($start) {
$oCriteria->setOffset( $start );
if ($start < 0) {
throw (new \Exception( 'invalid value specified for `start`.'));
} else {
$oCriteria->setOffset( $start );
}
}
if ($limit) {
$oCriteria->setLimit( $limit );
if ($limit < 0) {
throw (new \Exception( 'invalid value specified for `limit`.'));
} else {
$oCriteria->setLimit( $limit );
}
}
$oDataset = \TaskUserPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
@@ -1198,16 +1222,24 @@ class Task
$oCriteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL);
if ($filter) {
if ($filter || $filter=='0') {
$oCriteria->add( $oCriteria->getNewCriterion( \UsersPeer::USR_USERNAME, "%$filter%", \Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( \UsersPeer::USR_FIRSTNAME, "%$filter%", \Criteria::LIKE ) )->addOr( $oCriteria->getNewCriterion( \UsersPeer::USR_LASTNAME, "%$filter%", \Criteria::LIKE ) ) );
}
$oCriteria->add(\UsersPeer::USR_STATUS, 'ACTIVE');
$oCriteria->add(\UsersPeer::USR_UID, $aUIDS2, \Criteria::NOT_IN);
if ($start) {
$oCriteria->setOffset( $start );
if ($start < 0) {
throw (new \Exception( 'invalid value specified for `start`.'));
} else {
$oCriteria->setOffset( $start );
}
}
if ($limit) {
$oCriteria->setLimit( $limit );
if ($limit < 0) {
throw (new \Exception( 'invalid value specified for `limit`.'));
} else {
$oCriteria->setLimit( $limit );
}
}
$oDataset = \UsersPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);

2
workflow/engine/src/Services/Api/ProcessMaker/Project/ProjectUsers.php
View File

@@ -75,7 +75,7 @@ class ProjectUsers extends Api
*
* @url POST /:prjUid/ws/user/can-start-task
*/
public function doGetProjectWsUserCanStartTask($prjUid, wsUserCanStartTaskStructure $request_data = null)
public function doPostProjectWsUserCanStartTask($prjUid, wsUserCanStartTaskStructure $request_data = null)
{
try {
$request_data = (array)($request_data);