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

Se agregan validaciones para filter, start y limit en ASSIGNEE y ASSIGNEE ADHOC

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2014-01-24 16:19:25 -04:00
parent c309ea3a0b
commit 9e19a0185a
2 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
features/backend/project_property_assignee_resources/negative_tests.feature
View File

@@ -57,15 +57,15 @@ Scenario Outline: Assign a user or group to an activity (Field validation)
| high number for start | a | 1000 | 1 | 0 | 200 | array | | high number for start | a | 1000 | 1 | 0 | 200 | array |
| high number for start | a | 1000 | 0 | 0 | 200 | array | | high number for start | a | 1000 | 0 | 0 | 200 | array |
| empty result | xyz | 0 | 0 | 0 | 200 | array | | empty result | xyz | 0 | 0 | 0 | 200 | array |
| empty string | | 0 | 10000 | 0 | 200 | array | | empty string | | 0 | 10000 | 3 | 200 | array |
| empty string | | 1 | 2 | 0 | 200 | array | | empty string | | 1 | 2 | 2 | 200 | array |
| invalid start | a | b | c | 0 | 400 | string| | invalid start | a | b | c | 0 | 400 | string|
| invalid limit | a | 0 | c | 0 | 400 | string| | invalid limit | a | 0 | c | 0 | 400 | string|
| search 0 | 0 | 0 | 0 | 0 | 200 | array | | search 0 | 0 | 0 | 0 | 0 | 200 | array |
| search 0 | 0 | 0 | 100 | 0 | 200 | array | | search 0 | 0 | 0 | 100 | 0 | 200 | array |
| negative numbers | a | -10 | -20 | 0 | 200 | array | | negative numbers | a | -10 | -20 | 0 | 400 | string|
| real numbers | a | 0.0 | 1.0 | 0 | 400 | string| | real numbers | a | 0.0 | 1.0 | 1 | 200 | string|
| real numbers | a | 0.0 | 0.0 | 0 | 400 | string| | real numbers | a | 0.0 | 0.0 | 3 | 200 | string|
| real numbers | a | 0.1 | 1.4599 | 0 | 400 | string| | real numbers | a | 0.1 | 1.4599 | 0 | 400 | string|
| real numbers | a | 1.5 | 1.4599 | 0 | 400 | string| | real numbers | a | 1.5 | 1.4599 | 0 | 400 | string|

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

@@ -651,7 +651,7 @@ class Task
$oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME); $oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME); $oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL); $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( $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); $oCriteria->addSelectColumn(\TaskUserPeer::TAS_UID);
@@ -663,11 +663,19 @@ class Task
$oCriteria->add(\TaskUserPeer::TU_TYPE, 1); $oCriteria->add(\TaskUserPeer::TU_TYPE, 1);
$oCriteria->add(\TaskUserPeer::TU_RELATION, 1); $oCriteria->add(\TaskUserPeer::TU_RELATION, 1);
if ($start) { if ($start) {
if ($start < 0) {
throw (new \Exception( 'invalid value specified for `start`.'));
} else {
$oCriteria->setOffset( $start ); $oCriteria->setOffset( $start );
} }
}
if ($limit) { if ($limit) {
if ($limit < 0) {
throw (new \Exception( 'invalid value specified for `limit`.'));
} else {
$oCriteria->setLimit( $limit ); $oCriteria->setLimit( $limit );
} }
}
$oDataset = \TaskUserPeer::doSelectRS($oCriteria); $oDataset = \TaskUserPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
@@ -762,17 +770,25 @@ class Task
$oCriteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME); $oCriteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME); $oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL); $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( $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_STATUS, 'ACTIVE');
$oCriteria->add(\UsersPeer::USR_UID, $aUIDS2, \Criteria::NOT_IN); $oCriteria->add(\UsersPeer::USR_UID, $aUIDS2, \Criteria::NOT_IN);
if ($start) { if ($start) {
if ($start < 0) {
throw (new \Exception( 'invalid value specified for `start`.'));
} else {
$oCriteria->setOffset( $start ); $oCriteria->setOffset( $start );
} }
}
if ($limit) { if ($limit) {
if ($limit < 0) {
throw (new \Exception( 'invalid value specified for `limit`.'));
} else {
$oCriteria->setLimit( $limit ); $oCriteria->setLimit( $limit );
} }
}
$oDataset = \UsersPeer::doSelectRS($oCriteria); $oDataset = \UsersPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
@@ -1090,7 +1106,7 @@ class Task
$oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME); $oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME); $oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL); $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( $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); $oCriteria->addSelectColumn(\TaskUserPeer::TAS_UID);
@@ -1102,11 +1118,19 @@ class Task
$oCriteria->add(\TaskUserPeer::TU_TYPE, 2); $oCriteria->add(\TaskUserPeer::TU_TYPE, 2);
$oCriteria->add(\TaskUserPeer::TU_RELATION, 1); $oCriteria->add(\TaskUserPeer::TU_RELATION, 1);
if ($start) { if ($start) {
if ($start < 0) {
throw (new \Exception( 'invalid value specified for `start`.'));
} else {
$oCriteria->setOffset( $start ); $oCriteria->setOffset( $start );
} }
}
if ($limit) { if ($limit) {
if ($limit < 0) {
throw (new \Exception( 'invalid value specified for `limit`.'));
} else {
$oCriteria->setLimit( $limit ); $oCriteria->setLimit( $limit );
} }
}
$oDataset = \TaskUserPeer::doSelectRS($oCriteria); $oDataset = \TaskUserPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
@@ -1198,17 +1222,25 @@ class Task
$oCriteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME); $oCriteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME); $oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL); $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( $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_STATUS, 'ACTIVE');
$oCriteria->add(\UsersPeer::USR_UID, $aUIDS2, \Criteria::NOT_IN); $oCriteria->add(\UsersPeer::USR_UID, $aUIDS2, \Criteria::NOT_IN);
if ($start) { if ($start) {
if ($start < 0) {
throw (new \Exception( 'invalid value specified for `start`.'));
} else {
$oCriteria->setOffset( $start ); $oCriteria->setOffset( $start );
} }
}
if ($limit) { if ($limit) {
if ($limit < 0) {
throw (new \Exception( 'invalid value specified for `limit`.'));
} else {
$oCriteria->setLimit( $limit ); $oCriteria->setLimit( $limit );
} }
}
$oDataset = \UsersPeer::doSelectRS($oCriteria); $oDataset = \UsersPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();