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

HOR-727 CasesList>No se puede reasignar usuarios desde el inbox.

Browse Source
This commit is contained in:
Ronald Q
2016-04-08 17:43:39 -04:00
parent 5b2ee5e7aa
commit 3ad0052e15
1 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
workflow/engine/methods/cases/casesList_Ajax.php
View File

@@ -62,16 +62,15 @@ function filterUserListArray($users = array(), $filter = '')
if ($actionAjax == "userValues") { if ($actionAjax == "userValues") {
//global $oAppCache; //global $oAppCache;
$oAppCache = new AppCacheView(); $oAppCache = new AppCacheView();
$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null; $action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : null;
$query = isset($_REQUEST['query']) ? $_REQUEST['query'] : null; $query = isset( $_REQUEST['query'] ) ? $_REQUEST['query'] : null;
$users = array(); $users = array();
$users[] = array("USR_UID" => "", "USR_FULLNAME" => G::LoadTranslation("ID_ALL_USERS")); $users[] = array ("USR_UID" => "", "USR_FULLNAME" => G::LoadTranslation( "ID_ALL_USERS" ));
$users[] = array("USR_UID" => "CURRENT_USER", "USR_FULLNAME" => G::LoadTranslation("ID_CURRENT_USER")); $users[] = array ("USR_UID" => "CURRENT_USER", "USR_FULLNAME" => G::LoadTranslation( "ID_CURRENT_USER" ));
$users = filterUserListArray($users, $query); $users = filterUserListArray($users, $query);
//now get users, just for the Search action //now get users, just for the Search action
switch ($action) { switch ($action) {
case 'search_simple': case 'search_simple':
case 'to_reassign':
case 'search': case 'search':
G::LoadClass("configuration"); G::LoadClass("configuration");
@@ -88,10 +87,10 @@ if ($actionAjax == "userValues") {
$cUsers->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL); $cUsers->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
if (!is_null($query)) { if (!is_null($query)) {
$filters = $cUsers->getNewCriterion(UsersPeer::USR_FIRSTNAME, '%' . $query . '%', Criteria::LIKE) $filters = $cUsers->getNewCriterion( UsersPeer::USR_FIRSTNAME, '%'.$query.'%', Criteria::LIKE )->addOr(
->addOr($cUsers->getNewCriterion(UsersPeer::USR_LASTNAME, '%' . $query . '%', Criteria::LIKE) $cUsers->getNewCriterion( UsersPeer::USR_LASTNAME, '%'.$query.'%', Criteria::LIKE )->addOr(
->addOr($cUsers->getNewCriterion(UsersPeer::USR_USERNAME, '%' . $query . '%', Criteria::LIKE))); $cUsers->getNewCriterion( UsersPeer::USR_USERNAME, '%'.$query.'%', Criteria::LIKE )));
$cUsers->addAnd($filters); $cUsers->addOr( $filters );
} }
$cUsers->setLimit(20); $cUsers->setLimit(20);
$cUsers->addAscendingOrderByColumn(UsersPeer::TABLE_NAME . "." . $conf->userNameFormatGetFirstFieldByUsersTable()); $cUsers->addAscendingOrderByColumn(UsersPeer::TABLE_NAME . "." . $conf->userNameFormatGetFirstFieldByUsersTable());
@@ -163,13 +162,32 @@ if ($actionAjax == "processListExtJs") {
} }
if ($actionAjax == "getUsersToReassign") { if ($actionAjax == "getUsersToReassign") {
$_SESSION['TASK'] = $_REQUEST['TAS_UID']; $taskUid = $_POST['taskUid'];
$case = new Cases(); $search = $_POST['search'];
$task = new Task(); $pageSize = $_POST['pageSize'];
$tasks = $task->load($_SESSION['TASK']);
$result = new stdClass(); $sortField = (isset($_POST['sort']))? $_POST['sort'] : '';
$result->data = $case->getUsersToReassign($_SESSION['TASK'], $_SESSION['USER_LOGGED'], $_SESSION['PRO_UID']); $sortDir = (isset($_POST['dir']))? $_POST['dir'] : '';
print G::json_encode($result); $start = (isset($_POST['start']))? $_POST['start'] : 0;
$limit = (isset($_POST['limit']))? $_POST['limit'] : $pageSize;
$response = [];
try {
$case = new \ProcessMaker\BusinessModel\Cases();
$result = $case->getUsersToReassign($_SESSION['USER_LOGGED'], $taskUid, ['filter' => $search], $sortField, $sortDir, $start, $limit);
$response['status'] = 'OK';
$response['success'] = true;
$response['resultTotal'] = $result['total'];
$response['resultRoot'] = $result['data'];
} catch (Exception $e) {
$response['status'] = 'ERROR';
$response['message'] = $e->getMessage();
}
echo G::json_encode($response);
} }
if ($actionAjax == 'reassignCase') { if ($actionAjax == 'reassignCase') {