diff --git a/application/modules/opac/controllers/FormulaireController.php b/application/modules/opac/controllers/FormulaireController.php index a47089110c7df4d23007d6e21cff63371f581d26..e51ecb5b18739fee88fcda2700b1b17fe17417f7 100644 --- a/application/modules/opac/controllers/FormulaireController.php +++ b/application/modules/opac/controllers/FormulaireController.php @@ -20,12 +20,16 @@ */ class FormulaireController extends ZendAfi_Controller_Action { public function addAction() { + $article = Class_Article::find($this->_getParam('id_article')); + $formulaire = new Class_Formulaire(); $formulaire->setData(serialize($this->_request->getPost())) ->setUser(Class_Users::getIdentity()) - ->setIdArticle($this->_request->getParam('id_article')) + ->setArticle($article) ->save(); - $this->view->datas = unserialize($formulaire->getData()); + + $this->view->datas = $formulaire->getDatas(); + $this->view->article = $article; } } diff --git a/application/modules/opac/views/scripts/formulaire/add.phtml b/application/modules/opac/views/scripts/formulaire/add.phtml index 37fb1395f042caf1b3a61dd0636833b944f8408f..df8ec682d9e5c8bae988326834cfb519182fe943 100644 --- a/application/modules/opac/views/scripts/formulaire/add.phtml +++ b/application/modules/opac/views/scripts/formulaire/add.phtml @@ -1,14 +1,15 @@ <?php -echo ('Merci. Le formulaire a bien été enregistré :'); +echo $this->openBoite($this->article->getTitre()); -echo '<br/><ul>'; +echo '<h2>'.$this->_('Merci. Le formulaire a bien été enregistré :').'</h2>'; + +echo '<ul>'; + +foreach ($this->datas as $key => $value) + echo sprintf('<li>%s : %s</li>', $key, $value); + +echo '</ul>'; + +echo $this->closeBoite(); -foreach ($this->datas as $key => $value) { - echo "<li>"; - if (isset($key)) echo $key; - echo " : "; - if (isset($value)) echo $value; - echo " <br/> "; -} ?> -</ul> \ No newline at end of file diff --git a/tests/application/modules/opac/controllers/FormulaireControllerTest.php b/tests/application/modules/opac/controllers/FormulaireControllerTest.php index 90ee3e77ecd620be826669d5775d1d9b5c07a858..cc772efcb73b66e8bcb7d763e2b08c09d737d342 100644 --- a/tests/application/modules/opac/controllers/FormulaireControllerTest.php +++ b/tests/application/modules/opac/controllers/FormulaireControllerTest.php @@ -95,6 +95,13 @@ class FormulaireControllerPostActionTest extends FormulaireControllerPostActionT $this->assertEquals('Contactez nous', $this->new_formulaire->getArticle()->getTitre()); } + + /** @test */ + public function articleTitreContactezNousShouldBeDisplayed() { + $this->assertXPathContentContains('//h1', 'Contactez nous'); + } + + /** @test */ public function postFormulaireShouldReturnMessage() { $this->assertXpathContentContains('//div','Merci.',true ); @@ -105,7 +112,6 @@ class FormulaireControllerPostActionTest extends FormulaireControllerPostActionT public function postFormulaireShouldReturnPostValues() { $this->assertXpathContentContains('//div','Tinguette',true ); } - }