Skip to content

Commit e53abd4

Browse files
Merge pull request #150 from gregorybesson/develop
fix ->getQueryUsersByRole
2 parents ebaf3b8 + f46d507 commit e53abd4

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/Service/User.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ public function getQueryUsersByRole($role = null, $order = null, $search = '', $
906906

907907
public function getArrayUsersByRole($role = null, $order = null, $search = '')
908908
{
909-
$query = $this->getQueryUsersByRole($role, $order, $search);
909+
$qb = $this->getQueryUsersByRole($role, $order, $search);
910910
$users = array(
911911
array(
912912
'id' => 1,
@@ -929,7 +929,7 @@ public function getArrayUsersByRole($role = null, $order = null, $search = '')
929929
'team' => 1
930930
)
931931
);
932-
foreach ($query->getResult() as $user) {
932+
foreach ($qb->getQuery()->getResult() as $user) {
933933
$a = array();
934934
$a[] = $user->getId();
935935
$a[] = $user->getUsername();
@@ -978,8 +978,8 @@ public function getArrayUsersByRole($role = null, $order = null, $search = '')
978978

979979
public function getUsersByRole($role = 1, $order = 'DESC', $search = '')
980980
{
981-
$query = $this->getQueryUsersByRole($role, $order, $search);
982-
$result = $query->getResult();
981+
$qb = $this->getQueryUsersByRole($role, $order, $search);
982+
$result = $qb->getQuery()->getResult();
983983
return $result;
984984
}
985985

src/View/Helper/UserListWidget.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public function __construct(\PlaygroundUser\Service\User $userService)
2626
*/
2727
public function __invoke($roleId = 1, $order = null, $search = null, $filterField = null, $filterValue = null)
2828
{
29-
$query = $this->getUserService()->getQueryUsersByRole($roleId, $order, $search, $filterField, $filterValue);
30-
$users = $query->getResult();
29+
$qb = $this->getUserService()->getQueryUsersByRole($roleId, $order, $search, $filterField, $filterValue);
30+
$users = $qb->getQuery()->getResult();
3131

3232
return $users;
3333
}

0 commit comments

Comments
 (0)