From e949d9bf1cca47a96a881dabb686dd48cff5277b Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Mon, 3 Nov 2014 13:04:21 +0100
Subject: [PATCH] hotline_#16652_search_with_bib_filter fix css + fix search
widget post
---
application/modules/opac/controllers/BibController.php | 2 --
library/ZendAfi/Controller/Plugin/SelectionBib.php | 3 +++
library/ZendAfi/View/Helper/TagRechercheSimple.php | 6 +++---
public/opac/css/global.css | 2 +-
.../modules/opac/controllers/BibControllerTest.php | 9 +++++----
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/application/modules/opac/controllers/BibController.php b/application/modules/opac/controllers/BibController.php
index d3ddf4ae2bf..7123dc1e0b9 100644
--- a/application/modules/opac/controllers/BibController.php
+++ b/application/modules/opac/controllers/BibController.php
@@ -93,8 +93,6 @@ class BibController extends ZendAfi_Controller_Action {
$this->view->id_bibs_session = [];
if(array_isset('id_bibs', $_SESSION["selection_bib"]))
$this->view->id_bibs_session = $_SESSION["selection_bib"]['id_bibs'];
-
-
}
diff --git a/library/ZendAfi/Controller/Plugin/SelectionBib.php b/library/ZendAfi/Controller/Plugin/SelectionBib.php
index bc0079c7f1a..da03cd565f1 100644
--- a/library/ZendAfi/Controller/Plugin/SelectionBib.php
+++ b/library/ZendAfi/Controller/Plugin/SelectionBib.php
@@ -103,6 +103,9 @@ class ZendAfi_Controller_Plugin_SelectionBib extends Zend_Controller_Plugin_Abst
if(! $id_bibs = $request->getParam('bib_select'))
return [];
+ if(!is_array($id_bibs))
+ $id_bibs = explode(',', $id_bibs);
+
unset($_SESSION['selection_bib']);
return $_SESSION['selection_bib']['id_bibs'] = $id_bibs;
}
diff --git a/library/ZendAfi/View/Helper/TagRechercheSimple.php b/library/ZendAfi/View/Helper/TagRechercheSimple.php
index e2d092b3bbb..0d0ad5e02b4 100644
--- a/library/ZendAfi/View/Helper/TagRechercheSimple.php
+++ b/library/ZendAfi/View/Helper/TagRechercheSimple.php
@@ -65,9 +65,9 @@ class ZendAfi_View_Helper_TagRechercheSimple extends Zend_View_Helper_HtmlElemen
'name' => 'bib_select',
'value' => implode(',',$bib_ids)]);
- $anchor = $this->view->tagAnchor(['module' => 'opac',
- 'controller' => 'bib',
- 'action' => 'selection'],
+ $anchor = $this->view->tagAnchor($this->view->url(['module' => 'opac',
+ 'controller' => 'bib',
+ 'action' => 'selection'], null, true),
$this->view->_('Chercher dans les bibliothèques de votre choix'));
$message = $this->view->tag('p', $this->renderSelectBibMessage($bib_ids));
diff --git a/public/opac/css/global.css b/public/opac/css/global.css
index b125294c55d..f3a94627f21 100644
--- a/public/opac/css/global.css
+++ b/public/opac/css/global.css
@@ -2881,6 +2881,6 @@ a.loan-export {
}
-.boite.rech_simple .selected_bib_info span {
+.boite.rech_simple .selected_bibs_info span {
display: block;
}
\ No newline at end of file
diff --git a/tests/application/modules/opac/controllers/BibControllerTest.php b/tests/application/modules/opac/controllers/BibControllerTest.php
index c156ba3b48f..5bda8efbf02 100644
--- a/tests/application/modules/opac/controllers/BibControllerTest.php
+++ b/tests/application/modules/opac/controllers/BibControllerTest.php
@@ -326,7 +326,6 @@ class BibControllerBibViewInexistantTest extends BibControllerWithZoneTestCase {
abstract class BibControllerBibSelectionAbstractTestCase extends AbstractControllerTestCase {
public function setUp() {
parent::setUp();
-
$_SESSION['selection_bib'] = ['id_bibs' => []];
$this->fixture('Class_Zone',
@@ -352,13 +351,12 @@ abstract class BibControllerBibSelectionAbstractTestCase extends AbstractControl
'visibilite' => 2,
'id_zone' => 1]);
- $casablanca = $this->fixture('Class_Bib',
+ $paris = $this->fixture('Class_Bib',
['id' => 3,
'id_site' => '2',
'libelle' => 'Paris',
'visibilite' => 2,
'id_zone' => 2]);
-
}
}
@@ -429,7 +427,7 @@ class BibControllerBibSelectionWithBibsIdsInSessionTest extends BibControllerBib
class BibControllerBibSelectionPostDispatchTest extends BibControllerBibSelectionAbstractTestCase {
public function setUp() {
parent::setUp();
- $this->postDispatch('bib/selection', ['bib_select' => [1, 2]], true);
+ $this->postDispatch('bib/selection', ['bib_select' => [1, 2]]);
}
@@ -438,6 +436,7 @@ class BibControllerBibSelectionPostDispatchTest extends BibControllerBibSelectio
$this->assertEquals([1, 2] ,$_SESSION['selection_bib']['id_bibs']);
}
+
/** @test */
public function sessionShouldNotContainsMessage() {
$this->assertFalse(array_key_exists('message', $_SESSION['selection_bib']));
@@ -451,6 +450,8 @@ class BibControllerBibSelectionPostDispatchTest extends BibControllerBibSelectio
}
+
+
class BibControllerBibSelectionWithProfilIdParamTest extends BibControllerBibSelectionAbstractTestCase {
public function setUp() {
parent::setUp();
--
GitLab