diff --git a/application/modules/opac/controllers/PanierController.php b/application/modules/opac/controllers/PanierController.php index 917a2064bf640cac2724a8fb4036c4626af90543..5245f86c2b0e07536795e5a3dba0ca7e8a7e61d5 100644 --- a/application/modules/opac/controllers/PanierController.php +++ b/application/modules/opac/controllers/PanierController.php @@ -48,7 +48,7 @@ class PanierController extends ZendAfi_Controller_Action { $this->view->creer_panier = $this->view->url(['controller'=>'panier', 'action'=>'creer-panier']); - $paniers = $this->_user->getEditablePaniers(); + $paniers = $this->_user->getPaniers(); $this->view->paniers = $paniers; $this->view->title = $this->view->_("Vos paniers"); diff --git a/application/modules/opac/views/scripts/panier/index.phtml b/application/modules/opac/views/scripts/panier/index.phtml index 654a1da9e721931862112b4f5140dcc37cb377fa..8bdeb7c5d3b7daf51384f352426331fb3adc81bf 100644 --- a/application/modules/opac/views/scripts/panier/index.phtml +++ b/application/modules/opac/views/scripts/panier/index.phtml @@ -2,7 +2,9 @@ Class_ScriptLoader::getInstance()->addOPACScript('subModal'); $this->openBoite("Vos paniers de documents"); ?> -<span id="abonne_erreur" class="abonne"><?php if ($this->message != '')echo $this->traduire($this->message); ?></span> +<span id="abonne_erreur" class="abonne"> + <?php if ($this->message != '')echo $this->traduire($this->message); ?> +</span> <a href="<?php print($this->creer_panier); ?>" data-popup="true" ><?php echo $this->_('Créer un nouveau panier'); ?></a> <?php diff --git a/tests/application/modules/opac/controllers/PanierControllerTest.php b/tests/application/modules/opac/controllers/PanierControllerTest.php index a205994346efcec477a631b202736b054a9ad63c..fa9abfc8d29954420a4675aedf91837b6e4fc501 100644 --- a/tests/application/modules/opac/controllers/PanierControllerTest.php +++ b/tests/application/modules/opac/controllers/PanierControllerTest.php @@ -318,9 +318,9 @@ class PanierControllerIndexAsRedacteurActionTest extends PanierControllerTestCas /** @test */ - public function panierDomaineShouldContains4Paniers() { + public function panierDomaineShouldContains2Paniers() { $this->assertXPathContentContains('//span[@class="abonne"]', - 'Vous avez 4 panier(s)', + 'Vous avez 2 panier(s)', $this->_response->getBody()); }