From f009e8f9b82e8709d75f01d65b2ce668642005fb Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Mon, 26 Aug 2019 11:39:08 -0400 Subject: [PATCH] PMC-1082 Improve the function getAllUsersArray used in uxs Mode --- gulliver/system/class.rbac.php | 1 - workflow/engine/controllers/home.php | 29 ---------------------------- 2 files changed, 30 deletions(-) diff --git a/gulliver/system/class.rbac.php b/gulliver/system/class.rbac.php index cf0c3846d..e0e9cc34e 100644 --- a/gulliver/system/class.rbac.php +++ b/gulliver/system/class.rbac.php @@ -153,7 +153,6 @@ class RBAC 'error' => [], 'getUserArray' => ['PM_ALLCASES'], 'getCategoryArray' => ['PM_ALLCASES'], - 'getAllUsersArray' => ['PM_ALLCASES'], 'getStatusArray' => ['PM_ALLCASES'], 'getProcessArray' => ['PM_ALLCASES'], 'getProcesses' => ['PM_ALLCASES'], diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php index 290e07545..61b3bc4b4 100644 --- a/workflow/engine/controllers/home.php +++ b/workflow/engine/controllers/home.php @@ -325,7 +325,6 @@ class Home extends Controller // settings vars and rendering $this->setVar('statusValues', $this->getStatusArray($httpData->t, $this->userUid)); $this->setVar('categoryValues', $this->getCategoryArray()); - $this->setVar('allUsersValues', $this->getAllUsersArray('search')); $this->setVar('categoryTitle', G::LoadTranslation("ID_CATEGORY")); $this->setVar('processTitle', G::LoadTranslation("ID_PROCESS")); $this->setVar('statusTitle', G::LoadTranslation("ID_STATUS")); @@ -683,34 +682,6 @@ class Home extends Controller return $category; } - public function getAllUsersArray($action) - { - global $oAppCache; - $users = array(); - $users[] = array("CURRENT_USER",G::LoadTranslation("ID_CURRENT_USER")); - $users[] = array("",G::LoadTranslation("ID_ALL_USERS")); - - if ($action == 'to_reassign') { - //now get users, just for the Search action - $cUsers = $oAppCache->getToReassignListCriteria(null); - $cUsers->addSelectColumn(AppCacheViewPeer::USR_UID); - - if (g::MySQLSintaxis()) { - $cUsers->addGroupByColumn(AppCacheViewPeer::USR_UID); - } - - $cUsers->addAscendingOrderByColumn(AppCacheViewPeer::APP_CURRENT_USER); - $oDataset = AppCacheViewPeer::doSelectRS($cUsers); - $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $oDataset->next(); - while ($aRow = $oDataset->getRow()) { - $users[] = array($aRow['USR_UID'],$aRow['APP_CURRENT_USER']); - $oDataset->next(); - } - } - return $users; - } - public function getStatusArray($action, $userUid) { $status = array();