|
@@ -528,7 +528,7 @@ discard block |
|
|
block discarded – undo |
|
528
|
528
|
public function getSelectWherePaginatedQuery(QueryBuilder $qb, $currentPage = 1, $resultsPerPage = 25) |
|
529
|
529
|
{ |
|
530
|
530
|
$query = $this->getQueryFromBuilder($qb); |
|
531
|
|
- $offset = ($currentPage-1) * $resultsPerPage; |
|
|
531
|
+ $offset = ($currentPage - 1) * $resultsPerPage; |
|
532
|
532
|
|
|
533
|
533
|
$query->setFirstResult($offset) |
|
534
|
534
|
->setMaxResults($resultsPerPage); |
|
@@ -596,7 +596,7 @@ discard block |
|
|
block discarded – undo |
|
596
|
596
|
if ((!is_numeric($v) && $v != '') || (is_numeric($v) && $v > 0)) { |
|
597
|
597
|
if ($k == 'workflowState' && substr($v, 0, 1) == '!') { |
|
598
|
598
|
$qb->andWhere('tbl.' . $k . ' != :' . $k) |
|
599
|
|
- ->setParameter($k, substr($v, 1, strlen($v)-1)); |
|
|
599
|
+ ->setParameter($k, substr($v, 1, strlen($v) - 1)); |
|
600
|
600
|
} elseif (substr($v, 0, 1) == '%') { |
|
601
|
601
|
$qb->andWhere('tbl.' . $k . ' LIKE :' . $k) |
|
602
|
602
|
->setParameter($k, '%' . $v . '%'); |
Please login to merge, or discard this patch.