diff --git a/VERSIONS_HOTLINE/60951 b/VERSIONS_HOTLINE/60951 new file mode 100644 index 0000000000000000000000000000000000000000..521fde91f8610f3092c4efad154913eb5dc7b883 --- /dev/null +++ b/VERSIONS_HOTLINE/60951 @@ -0,0 +1 @@ + - ticket #60951 : Récursivité lorsqu'une boite 2 colonnes fait appel à son id pour les attributs col_gauche_module_id ou col_droite_module_id \ No newline at end of file diff --git a/library/ZendAfi/View/Helper/Accueil/ConteneurDeuxColonnes.php b/library/ZendAfi/View/Helper/Accueil/ConteneurDeuxColonnes.php index 80916da6323ece8dbb3e702a2d7c6f29eace7c3f..c9a71cc2ecc3c677850123f4e83006a9b0854541 100644 --- a/library/ZendAfi/View/Helper/Accueil/ConteneurDeuxColonnes.php +++ b/library/ZendAfi/View/Helper/Accueil/ConteneurDeuxColonnes.php @@ -43,6 +43,9 @@ class ZendAfi_View_Helper_Accueil_ConteneurDeuxColonnes extends ZendAfi_View_Hel $module_id = $this->preferences[$id_key]; if (!ZendAfi_View_Helper_Accueil_Base::getModuleHelper($module_id, $this->view)) $module_id = $this->createModuleForCol($colonne); + + if ($module_id == $this->id_module) + continue; } $helper = ZendAfi_View_Helper_Accueil_Base::getModuleHelper($module_id, $this->view); diff --git a/tests/application/modules/admin/controllers/AccueilControllerConteneurDeuxColonnesTest.php b/tests/application/modules/admin/controllers/AccueilControllerConteneurDeuxColonnesTest.php index 955243db50bcf915acf95a8ab1c2259dfa5e92a8..e899ffa7ee333f8c4615eda4d572f70f72ce6fd2 100644 --- a/tests/application/modules/admin/controllers/AccueilControllerConteneurDeuxColonnesTest.php +++ b/tests/application/modules/admin/controllers/AccueilControllerConteneurDeuxColonnesTest.php @@ -283,6 +283,20 @@ class AccueilControllerConteneurDeuxColonnesNewTest extends Admin_AbstractContro $this->assertXPathContentContains('//div', 'Le catalogue contient'); $this->assertXPath('//div[contains(@class,"conteneur_deux_colonnes")]//div[contains(@class,"rech_guide")]'); } + + + /** @test */ + public function withSameModuleIdOneModuleShouldBeCreated() { + $this->boite2cols['preferences'] = ['col_gauche_module_id' => 3, + 'col_gauche_type' => 'COMPTEURS', + 'col_droite_module_id' => 235, + 'col_droite_type' => 'RECH_GUIDEE']; + + $this->profil_biologie->updateModuleConfigAccueil(3, $this->boite2cols); + $this->dispatch('/opac?id_profil=34'); + $this->assertXPath('//div[contains(@class,"conteneur_deux_colonnes")]//div[contains(@class,"rech_guide")]'); + } + }