fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in darojas/processmaker (pull request #119)

Browse Source 
Se modifican validaciones para filter, start y limit en ASSIGNEE y ASSIGNEE ADHOC, se arreglan nombres en PROJECT USER, se agrega a api.ini FILES MANAGER
This commit is contained in:
erik ao
2014-01-27 17:11:24 -04:00
parent 4681ddcc3c dc746b5d3f
commit a27e9cea3e
3 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -625,6 +625,11 @@ class Task
$aUIDS1[] = $aGroup['GRP_UID'];
}
$groups = new \Groupwf();
if (isset($limit)) {
if ($limit == 0) {
return $aUsers;
}
}
$result = $groups->getAllGroup($start, $limit, $filter);
foreach ($result['rows'] as $results) {
if (in_array($results['GRP_UID'], $aUIDS1)) {
@@ -651,7 +656,7 @@ class Task
$oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL);
if ($filter || $filter=='0') {
if ($filter != '') {
$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);
@@ -669,11 +674,15 @@ class Task
$oCriteria->setOffset( $start );
}
}
if ($limit) {
if (isset($limit)) {
if ($limit < 0) {
throw (new \Exception( 'invalid value specified for `limit`.'));
} else {
$oCriteria->setLimit( $limit );
if ($limit == 0) {
return $aUsers;
} else {
$oCriteria->setLimit( $limit );
}
}
}
$oDataset = \TaskUserPeer::doSelectRS($oCriteria);
@@ -742,6 +751,11 @@ class Task
$aUIDS1[] = $aGroup['GRP_UID'];
}
$groups = new \Groupwf();
if (isset($limit)) {
if ($limit == 0) {
return $aUsers;
}
}
$result = $groups->getAllGroup($start, $limit, $filter);
foreach ($result['rows'] as $results) {
if (! in_array($results['GRP_UID'], $aUIDS1)) {
@@ -770,7 +784,7 @@ class Task
$oCriteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL);
if ($filter || $filter=='0') {
if ($filter != '') {
$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');
@@ -782,11 +796,15 @@ class Task
$oCriteria->setOffset( $start );
}
}
if ($limit) {
if (isset($limit)) {
if ($limit < 0) {
throw (new \Exception( 'invalid value specified for `limit`.'));
} else {
$oCriteria->setLimit( $limit );
if ($limit == 0) {
return $aUsers;
} else {
$oCriteria->setLimit( $limit );
}
}
}
$oDataset = \UsersPeer::doSelectRS($oCriteria);
@@ -1080,6 +1098,11 @@ class Task
$aUIDS1[] = $aGroup['GRP_UID'];
}
$groups = new \Groupwf();
if (isset($limit)) {
if ($limit == 0) {
return $aUsers;
}
}
$result = $groups->getAllGroup($start, $limit, $filter);
foreach ($result['rows'] as $results) {
if (in_array($results['GRP_UID'], $aUIDS1)) {
@@ -1106,7 +1129,7 @@ class Task
$oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL);
if ($filter || $filter=='0') {
if ($filter != '') {
$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);
@@ -1124,11 +1147,15 @@ class Task
$oCriteria->setOffset( $start );
}
}
if ($limit) {
if (isset($limit)) {
if ($limit < 0) {
throw (new \Exception( 'invalid value specified for `limit`.'));
} else {
$oCriteria->setLimit( $limit );
if ($limit == 0) {
return $aUsers;
} else {
$oCriteria->setLimit( $limit );
}
}
}
$oDataset = \TaskUserPeer::doSelectRS($oCriteria);
@@ -1194,6 +1221,11 @@ class Task
$aUIDS1[] = $aGroup['GRP_UID'];
}
$groups = new \Groupwf();
if (isset($limit)) {
if ($limit == 0) {
return $aUsers;
}
}
$result = $groups->getAllGroup($start, $limit, $filter);
foreach ($result['rows'] as $results) {
if (! in_array($results['GRP_UID'], $aUIDS1)) {
@@ -1222,7 +1254,7 @@ class Task
$oCriteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(\UsersPeer::USR_EMAIL);
if ($filter || $filter=='0') {
if ($filter != '') {
$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');
@@ -1234,11 +1266,15 @@ class Task
$oCriteria->setOffset( $start );
}
}
if ($limit) {
if (isset($limit)) {
if ($limit < 0) {
throw (new \Exception( 'invalid value specified for `limit`.'));
} else {
$oCriteria->setLimit( $limit );
if ($limit == 0) {
return $aUsers;
} else {
$oCriteria->setLimit( $limit );
}
}
}
$oDataset = \UsersPeer::doSelectRS($oCriteria);

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

@@ -19,8 +19,8 @@ class ProjectUsers extends Api
public function doGetProjectUsers($prjUid)
{
try {
$supervisor = new \BusinessModel\ProjectUser();
$arrayData = $supervisor->getProjectUsers($prjUid);
$users = new \BusinessModel\ProjectUser();
$arrayData = $users->getProjectUsers($prjUid);
//Response
$response = $arrayData;
} catch (\Exception $e) {
@@ -38,8 +38,8 @@ class ProjectUsers extends Api
public function doGetProjectStartingTasks($prjUid)
{
try {
$supervisor = new \BusinessModel\ProjectUser();
$arrayData = $supervisor->getProjectStartingTasks($prjUid);
$startingTasks = new \BusinessModel\ProjectUser();
$arrayData = $startingTasks->getProjectStartingTasks($prjUid);
//Response
$response = $arrayData;
} catch (\Exception $e) {
@@ -58,8 +58,8 @@ class ProjectUsers extends Api
public function doGetProjectStartingTaskUsers($prjUid, $usrUid)
{
try {
$supervisor = new \BusinessModel\ProjectUser();
$arrayData = $supervisor->getProjectStartingTaskUsers($prjUid, $usrUid);
$startingTasks = new \BusinessModel\ProjectUser();
$arrayData = $startingTasks->getProjectStartingTaskUsers($prjUid, $usrUid);
//Response
$response = $arrayData;
} catch (\Exception $e) {

1
workflow/engine/src/Services/api.ini
View File

@@ -31,6 +31,7 @@ debug = 1
project-users = "Services\Api\ProcessMaker\Project\ProjectUsers"
web-entry = "Services\Api\ProcessMaker\Project\WebEntry"
data-base-connections = "Services\Api\ProcessMaker\Project\DataBaseConnection"
files-manager = "Services\Api\ProcessMaker\Project\FilesManager"
[alias: projects]
project = "Services\Api\ProcessMaker\Project"