RF13038 - Allows to change avis cms title.

application/modules/admin/controllers/ModoController.php

@@ -206,13 +206,15 @@ class Admin_ModoController extends ZendAfi_Controller_Action {
 			return;
 		}
 
-
 		$form = new ZendAfi_Form(['id' => 'editaviscms', 
 															'action' => '',
 															'data-backurl' => $this->view->url(['module' => 'admin',
 																																	'controller' => 'modo',
 																																	'action' => 'aviscms'], null, true)]);
 
+		$form->addElement('text', 'entete', ['label' => 'Entête de l\'avis',
+																				 'size' => '100',
+																				 'value' => $avis->getEntete()]);
 
 		$form->addElement('textarea', 'avis', ['label' => 'Contenu de l\'avis',
 																					 'value' => $avis->getAvis()]);
@@ -222,12 +224,10 @@ class Admin_ModoController extends ZendAfi_Controller_Action {
 			return;
 		}												                   
 
-
 		$this->view->subview = $this->view->partial('modo/edit-aviscms.phtml',
 																								['form' => $form, 
 																								 'title' => 'Modification de l\'avis "'. $avis->getEntete() .'"']);
 
-
 		$this->_forward('index');
 	}
 
@@ -242,6 +242,11 @@ class Admin_ModoController extends ZendAfi_Controller_Action {
 			$this->_helper->notify($this->view->_('Contenu de l\'avis modifié'));
 		}
 
+		if ($avis->getEntete() != $form->entete->getValue()) {
+			$avis->setEntete($form->entete->getValue())->save();
+			$this->_helper->notify($this->view->_('Entête de l\'avis modifié'));
+		}
+
 		return true;
 	}
 

tests/application/modules/admin/controllers/ModoControllerTest.php

@@ -75,37 +75,37 @@ abstract class ModoControllerSuggestionAchatTestCase extends Admin_AbstractContr
 			->whenCalled('findAllBy')
 			->with(['order' => 'date_creation'])
 			->answers([
-								 Class_SuggestionAchat::newInstanceWithId(2)
-								 ->setDateCreation('2012-03-01')
-								 ->setTitre('Harry Potter')
-								 ->setAuteur('J.K.Rowling')
-								 ->setIsbn('1234567890')
-								 ->setDescriptionUrl('http://harrypotter.fr')
-								 ->setCommentaire('Je veux le lire')
-								 ->setUser(Class_Users::newInstanceWithId(6)
-													 ->setIdabon('3435')
-													 ->beAbonneSIGB()
-													 ->setPrenom('Petit')
-													 ->setNom('Poucet')
-													 ->setMail('ppoucet@gmail.com')),
-
-								 Class_SuggestionAchat::newInstanceWithId(3)
-								 ->setDateCreation('2012-03-02')
-								 ->setTitre('Millenium')
-								 ->setAuteur('Stieg Larsson'),
-
-								 Class_SuggestionAchat::newInstanceWithId(3)
-								 ->setDateCreation('2012-03-19')
-								 ->setTitre('Habibi')
-								 ->setCommentaire('Une bonne BD')
-								 ->setUser(Class_Users::newInstanceWithId(10)
-													 ->beInvite()
-													 ->setIdabon('0')
-													 ->setPrenom('Marcel')
-													 ->setNom('Duchamp')							
-													 ->setBib(Class_Bib::newInstanceWithId(3)
-																		->setLibelle('Annecy')))
-								 ]);
+									Class_SuggestionAchat::newInstanceWithId(2)
+									->setDateCreation('2012-03-01')
+									->setTitre('Harry Potter')
+									->setAuteur('J.K.Rowling')
+									->setIsbn('1234567890')
+									->setDescriptionUrl('http://harrypotter.fr')
+									->setCommentaire('Je veux le lire')
+									->setUser(Class_Users::newInstanceWithId(6)
+														->setIdabon('3435')
+														->beAbonneSIGB()
+														->setPrenom('Petit')
+														->setNom('Poucet')
+														->setMail('ppoucet@gmail.com')),
+
+									Class_SuggestionAchat::newInstanceWithId(3)
+									->setDateCreation('2012-03-02')
+									->setTitre('Millenium')
+									->setAuteur('Stieg Larsson'),
+
+									Class_SuggestionAchat::newInstanceWithId(3)
+									->setDateCreation('2012-03-19')
+									->setTitre('Habibi')
+									->setCommentaire('Une bonne BD')
+									->setUser(Class_Users::newInstanceWithId(10)
+														->beInvite()
+														->setIdabon('0')
+														->setPrenom('Marcel')
+														->setNom('Duchamp')							
+														->setBib(Class_Bib::newInstanceWithId(3)
+																		 ->setLibelle('Annecy')))
+									]);
 	}
 }
 
@@ -226,9 +226,9 @@ class ModoControllerSuggestionAchatEditUnknownTest extends ModoControllerSuggest
 	public function setUp() {
 		parent::setUp();
 		Storm_Test_ObjectWrapper::onLoaderOfModel('Class_SuggestionAchat')
-				->whenCalled('find')
-				->with(99)
-				->answers(null);
+			->whenCalled('find')
+			->with(99)
+			->answers(null);
 		
 		$this->dispatch('/admin/modo/suggestion-achat-edit/id/99', true);
 	}
@@ -303,9 +303,9 @@ class ModoControllerSuggestionAchatDeleteUnknownTest extends ModoControllerSugge
 	public function setUp() {
 		parent::setUp();
 		Storm_Test_ObjectWrapper::onLoaderOfModel('Class_SuggestionAchat')
-				->whenCalled('find')
-				->with(99)
-				->answers(null);
+			->whenCalled('find')
+			->with(99)
+			->answers(null);
 
 		$this->dispatch('admin/modo/suggestion-achat-delete/id/99', true);
 	}
@@ -328,10 +328,10 @@ class ModoControllerEditAvisCmsTest extends Admin_AbstractControllerTestCase {
 																																						'login' => 'biquette',
 																																						'password' => 'mysecret']),
 																	'article' => $this->fixture('Class_Article', ['id' => 2,
-																																						'titre' => 'Coucou la biquette',
-																																						'contenu' => 'plop plop']),
-																	'avis' => "Ceci est un avis de test !",
-																	'entete' => 'Avis de test',
+																																								'titre' => 'Coucou la biquette',
+																																								'contenu' => 'plop plop']),
+																	'avis' => "Yes you can !",
+																	'entete' => 'Can you accept my merge request ?',
 																	'note' => '3']);
 	}
 
@@ -346,14 +346,31 @@ class ModoControllerEditAvisCmsTest extends Admin_AbstractControllerTestCase {
 	/** @test **/
 	public function textAreaShouldContainsThisIsATest() {
 		$this->dispatch('admin/modo/edit-aviscms/id/1', true);
-		$this->assertXPathContentContains('//textarea[@id="avis"]', 'Ceci est un avis de test !');
+		$this->assertXPathContentContains('//textarea[@id="avis"]', 'Yes you can !');
+	}
+
+
+	/** @test **/
+	public function inputTextShouldContainsCanYouAcceptMyMergeRequest() {
+		$this->dispatch('admin/modo/edit-aviscms/id/1', true);
+		$this->assertXPath('//input[@type="text"][@id="entete"][@value="Can you accept my merge request ?"]');
 	}
 
+
 	/** @test **/
 	public function avisShouldContainsThisIsATestModified() {
-		$this->postDispatch('admin/modo/edit-aviscms/id/1', ['avis' => 'Ceci est un avis de test modifié!']);
+		$this->postDispatch('admin/modo/edit-aviscms/id/1', 
+												['avis' => 'Ceci est un avis de test modifié!']);
 		$this->assertEquals('Ceci est un avis de test modifié!', Class_Avis::find(1)->getAvis());
 	}
+
+
+	/** @test **/
+	public function avisEnTeteShouldContainsWooT() {
+		$this->postDispatch('admin/modo/edit-aviscms/id/1', 
+												['entete' => 'w00t !']);
+		$this->assertEquals('w00t !', Class_Avis::find(1)->getEntete());
+	}
 }