Merge pull request 'Handle no tickets results returned from search' (#13) from ticket-no-results into master

Reviewed-on: https://gitea/IT/intranet/pulls/13
This commit is contained in:
Audrey Jensen 2023-09-20 16:22:14 -05:00
commit eb72070dbf
2 changed files with 4 additions and 1 deletions

View File

@ -34,12 +34,14 @@ class CSPController extends AbstractController
$searchQuery = $ticketsRepo->getByKeyword($searchKeywords); $searchQuery = $ticketsRepo->getByKeyword($searchKeywords);
$paginator = new \Doctrine\ORM\Tools\Pagination\Paginator($searchQuery); $paginator = new \Doctrine\ORM\Tools\Pagination\Paginator($searchQuery);
$ticketsPerPage = count($paginator); $ticketsPerPage = count($paginator);
//If no tickets were found, return a special page.
//NOTE: we set page information to 1 of 1. Paginator has no tickets, which we're letting the twig template deal with.
return $this->render('cspViewer.html.twig',['tickets' => $paginator, 'portal' => $portal, 'pageNum' => 1, 'pageCount' => 1, 'form' => $form]);
} }
else else
{ {
$paginator = new \Doctrine\ORM\Tools\Pagination\Paginator($query); $paginator = new \Doctrine\ORM\Tools\Pagination\Paginator($query);
} }
//Pagination //Pagination
$totalItems = count($paginator); $totalItems = count($paginator);
$pageCount = ceil($totalItems / $ticketsPerPage); $pageCount = ceil($totalItems / $ticketsPerPage);

View File

@ -49,6 +49,7 @@ class TicketRepository extends EntityRepository
{ {
$qb->andwhere('t.description LIKE :keyword'.$i) $qb->andwhere('t.description LIKE :keyword'.$i)
->orwhere('t.summary LIKE :keyword'.$i) ->orwhere('t.summary LIKE :keyword'.$i)
->orwhere('t.id LIKE :keyword'.$i)
->setParameter('keyword'.$i, '%'.$keyword.'%'); ->setParameter('keyword'.$i, '%'.$keyword.'%');
} }
return $qb return $qb