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

HOR-2887

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-05-18 10:58:13 -04:00
parent 782a21c7cb
commit 5065e669e1
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/controllers/home.php
View File

@@ -279,6 +279,7 @@ class Home extends Controller
// settings html template // settings html template
$this->setView( $this->userUxBaseTemplate . PATH_SEP . 'appListSearch' ); $this->setView( $this->userUxBaseTemplate . PATH_SEP . 'appListSearch' );
// get data
$process = (isset($httpData->process)) ? $httpData->process : null; $process = (isset($httpData->process)) ? $httpData->process : null;
$status = (isset($httpData->status)) ? $httpData->status : null; $status = (isset($httpData->status)) ? $httpData->status : null;
$search = (isset($httpData->search)) ? $httpData->search : null; $search = (isset($httpData->search)) ? $httpData->search : null;
@@ -286,16 +287,14 @@ class Home extends Controller
$user = (isset($httpData->user)) ? $httpData->user : null; $user = (isset($httpData->user)) ? $httpData->user : null;
$dateFrom = (isset($httpData->dateFrom)) ? $httpData->dateFrom : null; $dateFrom = (isset($httpData->dateFrom)) ? $httpData->dateFrom : null;
$dateTo = (isset($httpData->dateTo)) ? $httpData->dateTo : null; $dateTo = (isset($httpData->dateTo)) ? $httpData->dateTo : null;
$processTitle = "";
if (!empty($process)) { if (!empty($process)) {
$processTitle = Process::loadById($process)->getProTitle(); $processTitle = Process::loadById($process)->getProTitle();
} else {
$processTitle = '';
} }
if (!empty($user)) { $userName = "";
if (!empty($user) && $user !== "ALL" && $user !== "CURRENT_USER") {
$userObject = Users::loadById($user); $userObject = Users::loadById($user);
$userName = $userObject->getUsrLastname()." ".$userObject->getUsrFirstname(); $userName = $userObject->getUsrLastname() . " " . $userObject->getUsrFirstname();
} else {
$userName = '';
} }
$cases = $this->getAppsData( $httpData->t, null, null, $user, null, $search, $process, $status, $dateFrom, $dateTo, null, null, 'APP_CACHE_VIEW.APP_NUMBER', $category); $cases = $this->getAppsData( $httpData->t, null, null, $user, null, $search, $process, $status, $dateFrom, $dateTo, null, null, 'APP_CACHE_VIEW.APP_NUMBER', $category);

4
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -227,9 +227,7 @@ class Cases
{ {
Validator::isArray($dataList, '$dataList'); Validator::isArray($dataList, '$dataList');
if (!isset($dataList["userId"])) { if (!isset($dataList["userId"])) {
throw (new \Exception(\G::LoadTranslation("ID_USER_NOT_EXIST", array('userId','')))); $dataList["userId"] = null;
} else {
Validator::usrUid($dataList["userId"], "userId");
} }
$solrEnabled = false; $solrEnabled = false;