fix compatibility with formation modelFusion

library/Class/ModeleFusion.php

@@ -63,11 +63,7 @@ class Class_ModeleFusion extends Storm_Model_Abstract {
 
 
 	public function getDataSourceNamed($name) {
-		$this->dataSource=array_at($name, $this->getDataSource());
-		return $this->dataSource;
-		if (!$this->dataSource)
-			return $this->dataSource=array_at($name, $this->getDataSource());
-		return $this->dataSource->callGetterByAttributeName($name);
+		return array_at($name, $this->getDataSource());
 	}
 
 
@@ -142,9 +138,9 @@ class Class_ModeleFusion extends Storm_Model_Abstract {
 		$model = $instance->callGetterByAttributeName(array_shift($attributes));
 		if (!$model)
 			return '';
+
 		if (is_array($value = $this->getValue($model, $attributes)))
 			return $this->buildSection($value,array_shift($match));
-//			return $this->buildTable($value, array_shift($match));
 
 		return $this->htmlize($value);
 	}
@@ -161,12 +157,16 @@ class Class_ModeleFusion extends Storm_Model_Abstract {
 			}
 
 			else $attributes =[ $match];
-		xdebug_break();
+
 		$model = $this->getDataSourceNamed(array_shift($attributes));
 
-		if (is_array($value = $this->getValue($model, $attributes)))
+		$value = $this->getValue($model, $attributes);
+
+		if (is_array($value) && ($this->getNom() === 'recherche' || $this->getNom() === 'article'))
 			return $this->buildSection($value,array_shift($match));
-//			return $this->buildTable($value, array_shift($match));
+
+		if (is_array($value))
+			return $this->buildTable($value, array_shift($match));
 
 		return $this->htmlize($value);
 	}

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

@@ -1831,7 +1831,7 @@ class FormationControllerFicheEmargementSessionJavaFevrierTest extends Formation
 
 	/** @test */
 	public function pageShouldContainsTableWithNomPrenom() {
-		$this->assertXPathContentContains('//table//td', 'Curzillat');
+		$this->assertXPathContentContains('//table//td', 'Curzillat', $this->_response->getBody());
 		$this->assertXPathContentContains('//table//td', 'Benoit');
 	}