From 269345ff1846a55f2a974026d7f47bbc510aa078 Mon Sep 17 00:00:00 2001
From: Laurent Laffont <llaffont@afi-sa.fr>
Date: Tue, 2 Jan 2018 10:46:53 +0100
Subject: [PATCH] hotline #66892 mobile: fix "next page" on search result
---
VERSIONS_HOTLINE/66892 | 1 +
library/ZendAfi/View/Helper/Telephone/Pager.php | 15 ++++-----------
2 files changed, 5 insertions(+), 11 deletions(-)
create mode 100644 VERSIONS_HOTLINE/66892
diff --git a/VERSIONS_HOTLINE/66892 b/VERSIONS_HOTLINE/66892
new file mode 100644
index 00000000000..55f8cc6d569
--- /dev/null
+++ b/VERSIONS_HOTLINE/66892
@@ -0,0 +1 @@
+ - ticket #66892 : affichage mobile, résultat de recherche: correction de la navigation paginée qui pouvait générer une page vide
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Telephone/Pager.php b/library/ZendAfi/View/Helper/Telephone/Pager.php
index 8f638f415b6..4e25102a2af 100644
--- a/library/ZendAfi/View/Helper/Telephone/Pager.php
+++ b/library/ZendAfi/View/Helper/Telephone/Pager.php
@@ -16,16 +16,10 @@
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// OPAC3 - Recherche
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-class ZendAfi_View_Helper_Telephone_Pager extends ZendAfi_View_Helper_BaseHelper {
- //---------------------------------------------------------------------
- // Main routine
- //---------------------------------------------------------------------
+class ZendAfi_View_Helper_Telephone_Pager extends ZendAfi_View_Helper_BaseHelper {
public function pager($nombre,$nb_par_page,$page)
{
if(!$nombre) return;
@@ -36,16 +30,15 @@ class ZendAfi_View_Helper_Telephone_Pager extends ZendAfi_View_Helper_BaseHelper
if($nombre % $nb_par_page) $nb_pages++;
if($nb_pages == 1) return;
- // Pager
$html='<div class="ui-bar" data-theme="c" data-role="footer" data-id="pager" data-position="fixed">';
$html.='<div data-role="controlgroup" data-type="horizontal">';
- $html.=sprintf('<a href="%s" data-role="button" data-icon="arrow-l" %s>%s</a>',
+ $html.=sprintf('<a href="%s" data-role="button" data-icon="arrow-l" data-ajax="false" %s>%s</a>',
$this->view->url(['page'=>$page-1]),
$page > 1 ? '' : 'class="ui-disabled"',
$this->translate()->_('Page précédente'));
- $html.=sprintf('<a href="%s" data-role="button" data-icon="arrow-r" data-iconpos="right" %s>%s</a>',
+ $html.=sprintf('<a href="%s" data-role="button" data-icon="arrow-r" data-ajax="false" data-iconpos="right" %s>%s</a>',
$this->view->url(['page'=>$page+1]),
($page != $nb_pages) ? '' : 'class="ui-disabled"',
$this->translate()->_('Page suivante'));
--
GitLab