From 17da857a1bf6eb29971490bf8c0aa15e887bac7a Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Sat, 17 Nov 2012 15:08:06 +0000
Subject: [PATCH] =?UTF-8?q?Formulaires:=20am=C3=A9lioration=20affichage=20?=
=?UTF-8?q?apr=C3=A8s=20post?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../opac/controllers/FormulaireController.php | 8 +++++--
.../opac/views/scripts/formulaire/add.phtml | 21 ++++++++++---------
.../controllers/FormulaireControllerTest.php | 8 ++++++-
3 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/application/modules/opac/controllers/FormulaireController.php b/application/modules/opac/controllers/FormulaireController.php
index a47089110c7..e51ecb5b187 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 37fb1395f04..df8ec682d9e 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 90ee3e77ecd..cc772efcb73 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 );
}
-
}
--
GitLab