diff --git a/module/api/v1/entries/productissue.php b/module/api/v1/entries/productissue.php index 8ed9ab843d..4c71824db2 100644 --- a/module/api/v1/entries/productissue.php +++ b/module/api/v1/entries/productissue.php @@ -127,7 +127,7 @@ class productIssueEntry extends entry foreach($issue->assignedTo as $account) $accountList[] = $account; $accountList[] = $issue->openedBy; $accountList = array_unique($accountList); - $profileList = $this->loadModel('user')->getUserDetailsForAPI($accountList); + $profileList = $this->loadModel('user')->getListForGitLabAPI($accountList); /* Set the user detail to assignedTo and openedBy. */ foreach($issue->assignedTo as $key => $account) @@ -190,7 +190,7 @@ class productIssueEntry extends entry /* Format user detail and date. */ $accountList = array_unique($accountList); - $profileList = $this->loadModel('user')->getUserDetailsForAPI($accountList); + $profileList = $this->loadModel('user')->getListForGitLabAPI($accountList); foreach($actions as $key => $action) { $action->actor = isset($profileList[$action->actor]) ? $profileList[$action->actor] : array(); diff --git a/module/api/v1/entries/productissues.php b/module/api/v1/entries/productissues.php index 1dea741db8..d1b27b60ef 100644 --- a/module/api/v1/entries/productissues.php +++ b/module/api/v1/entries/productissues.php @@ -310,7 +310,7 @@ class productIssuesEntry extends entry $userList[] = $issue->openedBy; } $userList = array_unique($userList); - $userDetails = $this->loadModel('user')->getUserDetailsForAPI($userList); + $userDetails = $this->loadModel('user')->getListForGitLabAPI($userList); /** * Set the user detail to assignedTo and openedBy. diff --git a/module/user/model.php b/module/user/model.php index 1ba97680c3..f261d9ca8b 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -2798,7 +2798,7 @@ class userModel extends model * @access public * @return array */ - public function getUserDetailsForAPI($userList) + public function getListForGitLabAPI($userList) { $users = $this->dao->select($this->config->user->detailFields)->from(TABLE_USER)->where("account")->in($userList)->fetchAll(); diff --git a/module/user/test/model/getuserdetailsforapi.php b/module/user/test/model/getlistforgitlabapi.php similarity index 100% rename from module/user/test/model/getuserdetailsforapi.php rename to module/user/test/model/getlistforgitlabapi.php diff --git a/module/user/test/user.class.php b/module/user/test/user.class.php index a6f7d76eb8..77e77f8f61 100755 --- a/module/user/test/user.class.php +++ b/module/user/test/user.class.php @@ -981,9 +981,9 @@ class userTest * @access public * @return void */ - public function getUserDetailsForAPITest($userList) + public function getListForGitLabAPITest($userList) { - return $this->objectModel->getUserDetailsForAPI($userList); + return $this->objectModel->getListForGitLabAPI($userList); } /**