jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix pagination on invoice templates page (#2260)

Browse Source
This commit is contained in:
Kevin Papst
2021-01-14 13:12:34 +01:00
committed by GitHub
parent bf47bb1840
commit 2a986517f7
4 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Repository/UserRepository.php
View File

@@ -23,7 +23,6 @@ use App\Repository\Query\UserQuery;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\ORMException;
use Doctrine\ORM\QueryBuilder;
use Pagerfanta\Adapter\DoctrineORMAdapter;
use Pagerfanta\Pagerfanta;
use Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface;
@@ -104,16 +103,13 @@ class UserRepository extends EntityRepository implements UserLoaderInterface
public function findByQuery(UserQuery $query)
{
@trigger_error('UserRepository::findByQuery() is deprecated and will be removed with 2.0', E_USER_DEPRECATED);
$qb = $this->getQueryBuilderForQuery($query);
if (BaseQuery::RESULT_TYPE_PAGER === $query->getResultType()) {
$paginator = new Pagerfanta(new DoctrineORMAdapter($qb->getQuery(), false));
$paginator->setMaxPerPage($query->getPageSize());
$paginator->setCurrentPage($query->getPage());
return $paginator;
return $this->getPagerfantaForQuery($query);
}
$qb = $this->getQueryBuilderForQuery($query);
if (BaseQuery::RESULT_TYPE_OBJECTS === $query->getResultType()) {
return $qb->getQuery()->execute();
}