Skip to content
Snippets Groups Projects
Commit 74ac5d97 authored by Stefan Galinski's avatar Stefan Galinski :video_game:
Browse files

[BUGFIX] 404 page if pagination is disabled (0 in limit)

parent 432ce17d
No related branches found
No related tags found
No related merge requests found
......@@ -210,7 +210,7 @@ class JoblistController extends ActionController {
// get all jobs for the current page
$allJobs = $this->jobRepository->findJobsByFilter($filters)->toArray();
$numberOfPages = ($jobLimit <= 0 ? 0 : \ceil(\count($allJobs) / $jobLimit));
if ($currentPageBrowserPage >= $numberOfPages) {
if ($numberOfPages !== 0 && $currentPageBrowserPage >= $numberOfPages) {
/** @var ErrorController $errorController */
$errorController = GeneralUtility::makeInstance(ErrorController::class);
$response = $errorController->pageNotFoundAction(
......
......@@ -3,89 +3,96 @@
<f:layout name="PageBrowser"/>
<f:section name="main">
<nav>
<ul class="pagination">
<f:if condition="{prevPageExist}">
<f:then>
<li class="tx-pagebrowse-prev">
<f:variable name="prevPage" value="{currentPage - 1}"/>
<f:link.action addQueryString="1" additionalParams="{tx_sgjobs_pagebrowser: {currentPage: prevPage}}"
additionalAttributes="{aria-label: 'Previous'}">
&laquo;
</f:link.action>
</li>
</f:then>
<f:else>
<li class="tx-pagebrowse-prev disabled">
<a aria-label="Previous">
<span aria-hidden="true">
&laquo;
</span>
</a>
</li>
</f:else>
</f:if>
<f:if condition="{enableLessPages} && {showLessPages}">
<li>
<f:variable name="lessPage" value="{currentPage - 2}"/>
<f:link.action addQueryString="1" additionalParams="{tx_sgjobs_pagebrowser: {currentPage: lessPage}}">
...
</f:link.action>
</li>
</f:if>
<f:for each="{pageLinks}" as="pageLink">
<f:if condition="{pageLink.isCurrentPage}">
<f:if condition="{numberOfPages} > 1">
<nav>
<ul class="pagination">
<f:if condition="{prevPageExist}">
<f:then>
<li class="tx-pagebrowse-current active">
<a href="#">
{pageLink.number}
<span class="sr-only">
(current)
</span>
</a>
<li class="tx-pagebrowse-prev">
<f:variable name="prevPage" value="{currentPage - 1}"/>
<f:link.action addQueryString="1"
additionalParams="{tx_sgjobs_pagebrowser: {currentPage: prevPage}}"
additionalAttributes="{aria-label: 'Previous'}">
&laquo;
</f:link.action>
</li>
</f:then>
<f:else>
<li class="tx-pagebrowse-page">
<f:link.action addQueryString="1" additionalParams="{tx_sgjobs_pagebrowser: {currentPage: pageLink.page}}">
{pageLink.number}
</f:link.action>
<li class="tx-pagebrowse-prev disabled">
<a aria-label="Previous">
<span aria-hidden="true">
&laquo;
</span>
</a>
</li>
</f:else>
</f:if>
</f:for>
<f:if condition="{enableMorePages} && {showNextPages}">
<li>
<f:variable name="morePage" value="{currentPage + 2}"/>
<f:link.action addQueryString="1" additionalParams="{tx_sgjobs_pagebrowser: {currentPage: morePage}}">
...
</f:link.action>
</li>
</f:if>
<f:if condition="{enableLessPages} && {showLessPages}">
<li>
<f:variable name="lessPage" value="{currentPage - 2}"/>
<f:link.action addQueryString="1"
additionalParams="{tx_sgjobs_pagebrowser: {currentPage: lessPage}}">
...
</f:link.action>
</li>
</f:if>
<f:for each="{pageLinks}" as="pageLink">
<f:if condition="{pageLink.isCurrentPage}">
<f:then>
<li class="tx-pagebrowse-current active">
<a href="#">
{pageLink.number}
<span class="sr-only">
(current)
</span>
</a>
</li>
</f:then>
<f:else>
<li class="tx-pagebrowse-page">
<f:link.action addQueryString="1"
additionalParams="{tx_sgjobs_pagebrowser: {currentPage: pageLink.page}}">
{pageLink.number}
</f:link.action>
</li>
</f:else>
</f:if>
</f:for>
<f:if condition="{nextPageExist}">
<f:then>
<li class="tx-pagebrowse-next">
<f:variable name="nextPage" value="{currentPage + 1}"/>
<f:link.action addQueryString="1" additionalParams="{tx_sgjobs_pagebrowser: {currentPage: nextPage}}"
additionalAttributes="{aria-label: 'Next'}">
&raquo;
<f:if condition="{enableMorePages} && {showNextPages}">
<li>
<f:variable name="morePage" value="{currentPage + 2}"/>
<f:link.action addQueryString="1"
additionalParams="{tx_sgjobs_pagebrowser: {currentPage: morePage}}">
...
</f:link.action>
</li>
</f:then>
<f:else>
<li class="tx-pagebrowse-next disabled">
<a aria-label="Next">
<span aria-hidden="true">
</f:if>
<f:if condition="{nextPageExist}">
<f:then>
<li class="tx-pagebrowse-next">
<f:variable name="nextPage" value="{currentPage + 1}"/>
<f:link.action addQueryString="1"
additionalParams="{tx_sgjobs_pagebrowser: {currentPage: nextPage}}"
additionalAttributes="{aria-label: 'Next'}">
&raquo;
</span>
</a>
</li>
</f:else>
</f:if>
</ul>
</nav>
</f:link.action>
</li>
</f:then>
<f:else>
<li class="tx-pagebrowse-next disabled">
<a aria-label="Next">
<span aria-hidden="true">
&raquo;
</span>
</a>
</li>
</f:else>
</f:if>
</ul>
</nav>
</f:if>
</f:section>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment