diff --git a/application/modules/opac/views/scripts/abonne/reservations.phtml b/application/modules/opac/views/scripts/abonne/reservations.phtml index 1017db03e729af9853d8f92cbf32f7e93bbf76be..402aa7410e1c11febf5c61a98739f1c611784640 100644 --- a/application/modules/opac/views/scripts/abonne/reservations.phtml +++ b/application/modules/opac/views/scripts/abonne/reservations.phtml @@ -7,18 +7,19 @@ <th style="text-align:left"><?php echo $this->_('n°');?></th> <th style="text-align:left"><?php echo $this->_('Titre');?></th> <th style="text-align:left"><?php echo $this->_('Auteur');?></th> + <th style="text-align:left"><?php echo $this->_('Bibliothèque');?></th> <th style="text-align:left"><?php echo $this->_('Etat');?></th> <th style="text-align:center"><?php echo $this->_('Rang');?></th> <th style="text-align:center;width:20px"><?php echo $this->_('Suppr.');?></th> </tr> <?php if ($this->fiche["message"]) { ?> <tr> - <td colspan="5"><p class="error"><?php echo $this->fiche["message"];?></p></td> + <td colspan="6"><p class="error"><?php echo $this->fiche["message"];?></p></td> </tr> <?php } ?> <?php if ($this->fiche["erreur"]) { ?> <tr> - <td colspan="5"><p class="error"><?php echo $this->fiche["erreur"];?></p></td> + <td colspan="6"><p class="error"><?php echo $this->fiche["erreur"];?></p></td> </tr> <?php } ?> <?php @@ -36,6 +37,7 @@ ?> </td> <td><?php echo $this->escape(strip_tags($resa->getAuteur()));?></td> + <td><?php echo $this->escape($resa->getBibliotheque());?></td> <td style="text-align:left"><?php echo $this->escape($resa->getEtat());?></td> <td style="text-align:center"><?php echo $this->escape($resa->getRang());?></td> <td style="text-align:center"> diff --git a/tests/application/modules/opac/controllers/AbonneControllerPretsTest.php b/tests/application/modules/opac/controllers/AbonneControllerPretsTest.php index f675211da35386d13480a9b8d66715e9a0dbef40..6c08103a3ae339b9806a07a717e6aaebde6a7c0f 100644 --- a/tests/application/modules/opac/controllers/AbonneControllerPretsTest.php +++ b/tests/application/modules/opac/controllers/AbonneControllerPretsTest.php @@ -133,13 +133,16 @@ class AbonneControllerPretsListTwoPretsTest extends AbstractAbonneControllerPret class AbonneControllerPretsListReservationTest extends AbstractAbonneControllerPretsTestCase { + protected $_potter; + public function setUp() { parent::setUp(); $potter = new Class_WebService_SIGB_Reservation('12', new Class_WebService_SIGB_Exemplaire(123)); - $potter->getExemplaire()->setTitre('Potter'); + $this->_potter = $potter->getExemplaire()->setTitre('Potter'); $potter->parseExtraAttributes(array('Etat' => 'Réservation émise', - 'Rang' => '2')); + 'Rang' => '2', + 'Bibliotheque' => 'Tombouctou')); $emprunteur = new Class_WebService_SIGB_Emprunteur('1234', 'Florence'); $emprunteur->reservationsAddAll(array($potter)); @@ -197,6 +200,13 @@ class AbonneControllerPretsListReservationTest extends AbstractAbonneControllerP public function linkToDeleteShouldBeAsExpected() { $this->assertXPath("//tr[2]//td//a[@href='/abonne/reservations/id_delete/12']"); } + + + /** @test */ + public function bibliothequeShouldBeTombouctou() { + $this->assertXPathContentContains('//tr[2]//td', 'Tombouctou', $this->_response->getBody()); + } + }