From 125eff993261133637b61db14e12076c23c702ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20B=C3=BCchler?= Date: Mon, 14 Feb 2022 07:59:11 +0200 Subject: [PATCH 1/2] [TASK] Make composer config validate --- .idea/.gitignore | 8 +++ .idea/bootstrap_package.iml | 129 ++++++++++++++++++++++++++++++++++++ .idea/deployment.xml | 35 ++++++++++ .idea/dictionaries | 6 ++ .idea/misc.xml | 6 ++ .idea/modules.xml | 8 +++ .idea/php.xml | 124 ++++++++++++++++++++++++++++++++++ .idea/vcs.xml | 6 ++ 8 files changed, 322 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/bootstrap_package.iml create mode 100644 .idea/deployment.xml create mode 100644 .idea/dictionaries create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/php.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..73f69e095 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/bootstrap_package.iml b/.idea/bootstrap_package.iml new file mode 100644 index 000000000..c0afe8b38 --- /dev/null +++ b/.idea/bootstrap_package.iml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml new file mode 100644 index 000000000..f6b43813c --- /dev/null +++ b/.idea/deployment.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dictionaries b/.idea/dictionaries new file mode 100644 index 000000000..b799ddad5 --- /dev/null +++ b/.idea/dictionaries @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..6f920d264 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..2fdfb0646 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 000000000..751874455 --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..94a25f7f4 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 5541acada90576866177b2bc95ecc99777a4357f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20B=C3=BCchler?= Date: Thu, 21 Jul 2022 20:21:32 +0300 Subject: [PATCH 2/2] [BUGFIX] Add all query parameters to pagination links Resolves: #1185 --- Classes/ViewHelpers/Link/PaginateViewHelper.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Classes/ViewHelpers/Link/PaginateViewHelper.php b/Classes/ViewHelpers/Link/PaginateViewHelper.php index 2febd4124..4f6584707 100644 --- a/Classes/ViewHelpers/Link/PaginateViewHelper.php +++ b/Classes/ViewHelpers/Link/PaginateViewHelper.php @@ -9,6 +9,7 @@ namespace BK2K\BootstrapPackage\ViewHelpers\Link; +use TYPO3\CMS\Extbase\Mvc\Request; use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper; @@ -37,7 +38,10 @@ public function render(): string $paginationPage = (int) $this->arguments['paginationPage']; $section = isset($this->arguments['section']) ? (string)$this->arguments['section'] : ''; - $arguments = []; + /** @var Request $request */ + $request = $this->renderingContext->getRequest(); + $arguments = $request->getQueryParams(); + unset($arguments['paginate'], $arguments['cHash']); if ($paginationPage > 1) { $arguments['paginate'][$paginationId]['page'] = $paginationPage; }