From 0f754605b7b5f1ab6fda0d3af1ff77c04b5d75eb Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Mon, 22 Apr 2013 12:23:15 +0000
Subject: [PATCH] =?UTF-8?q?Correction=20plantage=20kiosque=20si=20panier?=
=?UTF-8?q?=20supprim=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ZendAfi/View/Helper/Accueil/Kiosque.php | 10 ++++---
.../opac/controllers/JavaControllerTest.php | 26 +++++++++++++++++++
2 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/library/ZendAfi/View/Helper/Accueil/Kiosque.php b/library/ZendAfi/View/Helper/Accueil/Kiosque.php
index 24f389a328c..f79bea05791 100644
--- a/library/ZendAfi/View/Helper/Accueil/Kiosque.php
+++ b/library/ZendAfi/View/Helper/Accueil/Kiosque.php
@@ -157,16 +157,18 @@ class ZendAfi_View_Helper_Accueil_Kiosque extends ZendAfi_View_Helper_Accueil_Ba
public function getKiosqueHtml($page = 1) {
$catalogue=new Class_Catalogue();
-
$nombre_notices_par_page = $this->preferences['nb_notices'];
$this->preferences['nb_notices'] = 0;
$this->preferences['nb_analyse'] = 0;
$requetes = $catalogue->getRequetes($this->preferences);
+ $nombre_total_notices = 0;
+ $notices = [];
- $nombre_total_notices = fetchOne($requetes['req_comptage']);
-
- $notices = Class_Notice::findAllByRequeteRecherche($requetes['req_liste'],$nombre_notices_par_page,$page);
+ if (isset($requetes['req_comptage'])) {
+ $nombre_total_notices = fetchOne($requetes['req_comptage']);
+ $notices = Class_Notice::findAllByRequeteRecherche($requetes['req_liste'],$nombre_notices_par_page,$page);
+ }
switch($style_liste = $this->preferences["style_liste"]) {
case 'vignettes':
diff --git a/tests/application/modules/opac/controllers/JavaControllerTest.php b/tests/application/modules/opac/controllers/JavaControllerTest.php
index 3486b4c3959..330f5c9f8f6 100644
--- a/tests/application/modules/opac/controllers/JavaControllerTest.php
+++ b/tests/application/modules/opac/controllers/JavaControllerTest.php
@@ -84,4 +84,30 @@ class JavaControllerWithKiosqueMurPageTest extends AbstractControllerTestCase {
}
+
+
+class JavaControllerWithKiosqueMurAndPanierDeletedTest extends AbstractControllerTestCase {
+ public function setUp() {
+ parent::setUp();
+ $cfg_accueil = ['modules' => ['1' => ['division' => 1,
+ 'type_module' => 'KIOSQUE',
+ 'preferences' => ['style_liste' => 'mur',
+ 'id_panier' => 99999,
+ 'nb_notices' => 10,
+ 'nb_analyse' => 50,
+ 'titre' => 'Mon panier']]]];
+
+ Class_Profil::getCurrentProfil()->setCfgAccueil($cfg_accueil);
+
+ $this->dispatch('/', true);
+ }
+
+
+ /** @test */
+ public function titreMonPanierShouldBeDisplayed() {
+ $this->assertXPathContentContains('//h1', 'Mon panier', $this->_response->getBody());
+ }
+}
+
+
?>
\ No newline at end of file
--
GitLab