fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-2307

Browse Source
This commit is contained in:
Paula Quispe
2017-04-21 15:03:02 -04:00
parent 37c44e0ac5
commit 174f4d632e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/src/ProcessMaker/BusinessModel/User.php
View File

@@ -1140,6 +1140,7 @@ class User
* @param bool $flagRecord Flag that set the "getting" of record
* @param bool $throwException Flag to throw the exception (This only if the parameters are invalid)
* (TRUE: throw the exception; FALSE: returns FALSE)
* @param string $status The user's status, which can be "ACTIVE", "INACTIVE" or "VACATION"
*
* @return array Return an array with all Users, ThrowTheException/FALSE otherwise
*/
@@ -1150,7 +1151,8 @@ class User
$start = null,
$limit = null,
$flagRecord = true,
$throwException = true
$throwException = true,
$status = null
) {
try {
$arrayUser = array();
@@ -1210,7 +1212,9 @@ class User
$criteria->add($value[0], $value[1], $value[2]);
}
} else {
$criteria->add(\UsersPeer::USR_STATUS, 'ACTIVE', \Criteria::EQUAL);
if (!is_null($status)) {
$criteria->add(\UsersPeer::USR_STATUS, uppercase($status), \Criteria::EQUAL);
}
}
if ($flagFilter && trim($arrayWhere['filter']) != '') {

4
workflow/engine/src/ProcessMaker/Services/Api/User.php
View File

@@ -21,7 +21,7 @@ class User extends Api
* @class AccessControl {@permission PM_USERS,PM_FACTORY}
* @url GET
*/
public function index($filter = null, $lfilter = null, $rfilter = null, $start = null, $limit = null)
public function index($filter = null, $lfilter = null, $rfilter = null, $start = null, $limit = null, $status = null)
{
try {
$user = new \ProcessMaker\BusinessModel\User();
@@ -32,7 +32,7 @@ class User extends Api
"filterOption" => (!is_null($filter))? "" : ((!is_null($lfilter))? "LEFT" : ((!is_null($rfilter))? "RIGHT" : ""))
);
$response = $user->getUsers($arrayFilterData, null, null, $start, $limit, false);
$response = $user->getUsers($arrayFilterData, null, null, $start, $limit, false, true, $status);
return \ProcessMaker\Util\DateTime::convertUtcToIso8601($response['data'], $this->arrayFieldIso8601);
} catch (\Exception $e) {