Association des plages d'ouvertures aux sites sur les éditions / ajouts

application/modules/admin/controllers/OuverturesController.php

@@ -32,6 +32,8 @@ class Admin_OuverturesController extends ZendAfi_Controller_Action {
 			$fields[$field] = array('element' => 'select',
 															'options' => array('label' => $label,
 																								 'multiOptions' => $hours_select));
+		$fields['id_site'] = array('element' => 'hidden');
+															 
 
 		return array(
 								 'model' => array('class' => 'Class_Ouverture',

library/ZendAfi/Controller/Action.php

@@ -107,7 +107,9 @@ class ZendAfi_Controller_Action extends Zend_Controller_Action {
 			->addFormElements($form)
 			->addDisplayGroups($form);
 		
-		return $form->populate($model->toArray());
+		return $form
+			->populate($this->_request->getParams())
+			->populate($model->toArray());
 	}
 
 

library/ZendAfi/Controller/Action/RessourceDefinitions.php

@@ -121,8 +121,12 @@ class ZendAfi_Controller_Action_RessourceDefinitions {
 
 	public function addFormElements($form) {
 		$element_definitions = $this->getFormElementDefinitions();
+		
 		foreach($element_definitions as $name => $definition) {
-			$form->addElement($definition['element'], $name, $definition['options']);
+			$options = isset($definition['options']) ? $definition['options'] : array();
+
+			$form->addElement($definition['element'], $name, $options);
+
 			if ($label = $form->getElement($name)->getDecorator('label'))
 				$label->setOption('escape', false);
 		}

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

@@ -81,23 +81,6 @@ class OuverturesControllerIndexActionSiteCranTest extends OuverturesControllerTe
 
 
 
-class OuverturesControllerIndexActionWithoutSiteTest extends OuverturesControllerTestCase {
-	public function setUp() {
-		parent::setUp();
-		$this->dispatch('/admin/ouvertures/index', true);
-	}
-
-
-	/** @test */
-	public function answerShouldRedirectToIndexBib() {
-		xdebug_break();
-		$this->assertRedirectTo('/admin/bib');
-	}
-}
-
-
-
-
 class OuverturesControllerIndexActionSiteAnnecyTest extends OuverturesControllerTestCase {
 	public function setUp() {
 		parent::setUp();
@@ -123,6 +106,23 @@ class OuverturesControllerIndexActionSiteAnnecyTest extends OuverturesController
 
 
 
+class OuverturesControllerIndexActionWithoutSiteTest extends OuverturesControllerTestCase {
+	public function setUp() {
+		parent::setUp();
+		$this->dispatch('/admin/ouvertures/index', true);
+	}
+
+
+	/** @test */
+	public function answerShouldRedirectToIndexBib() {
+		xdebug_break();
+		$this->assertRedirectTo('/admin/bib');
+	}
+}
+
+
+
+
 class OuverturesControllerEditOuvertureMardiTest extends OuverturesControllerTestCase {
 	public function setUp() {
 		parent::setUp();
@@ -186,8 +186,35 @@ class OuverturesControllerAddOuvertureCranTest extends OuverturesControllerTestC
 	public function formShouldContainsSelectForDebutMatin() {
 		$this->assertXPath('//form//select');
 	}
+
+
+	/** @test */
+	public function hiddenFieldIdSiteShouldHaveValueOne() {
+		$this->assertXPath('//input[@name="id_site"][@type="hidden"][@value="1"]');
+	}
 }
 
 
 
+
+class OuverturesControllerPostAddOuvertureCranTest extends OuverturesControllerTestCase {
+	protected $_new_ouverture;
+
+	public function setUp() {
+		parent::setUp();
+		$this->postDispatch('/admin/ouvertures/add/id_site/3',
+												array('debut_matin' => '10:30',
+															'fin_matin' => '11:30',
+															'id_site' => 3));
+		$this->_new_ouverture = Class_Ouverture::getFirstAttributeForLastCallOn('save');
+	}
+
+
+	/** @test */
+	public function newOuvertureSiteIdShouldBeThree() {
+		$this->assertEquals(3, $this->_new_ouverture->getIdSite());
+	}
+}
+
+
 ?>
\ No newline at end of file