diff --git a/VERSIONS_HOTLINE/29373 b/VERSIONS_HOTLINE/29373 new file mode 100644 index 0000000000000000000000000000000000000000..cba32722053c0ba7f82bca3eb520a592c43c34c7 --- /dev/null +++ b/VERSIONS_HOTLINE/29373 @@ -0,0 +1 @@ + - ticket #29373 : Module sitothèque : le groupement par catégorie ne semble pas fonctionner \ No newline at end of file diff --git a/application/modules/admin/controllers/AccueilController.php b/application/modules/admin/controllers/AccueilController.php index 2c89de9312303f3beec88c590bf2fe9145bb744d..13daf4dcc2bf166582c8b6cf4b8b6e743b936ebd 100644 --- a/application/modules/admin/controllers/AccueilController.php +++ b/application/modules/admin/controllers/AccueilController.php @@ -111,10 +111,13 @@ class Admin_AccueilController extends Zend_Controller_Action { if ($categories=explode('-',$this->_getParam('id_categorie'))) $this->_request->setPost('id_categorie',$categories[0]); + if ($this->_request->getPost('type_aff') == ZendAfi_View_Helper_Accueil_Sito::DISPLAY_HIERARCHY) + $this->_request->setPost('group_by_categorie','0'); } + + public function sitothequeAction() { $this->preprocessSitoCategories(); - $this->_request->setPost('group_by_categorie','0'); $this->_simpleAction('SITO'); } diff --git a/tests/application/modules/admin/controllers/AccueilControllerTest.php b/tests/application/modules/admin/controllers/AccueilControllerTest.php index e128ec3dc1779c969ed0061fc90ee758291678bc..7b72d75881de0770d95a890dca308435747b3eb0 100644 --- a/tests/application/modules/admin/controllers/AccueilControllerTest.php +++ b/tests/application/modules/admin/controllers/AccueilControllerTest.php @@ -237,6 +237,7 @@ class AccueilControllerConfigSitothequePostTest extends Admin_AbstractController } + /** @test */ public function selectHierachicalDisplayShouldForceGroupByCategoryToFalse() { $this->postDispatch('/admin/accueil/sitotheque?config=accueil&id_profil=1&type_module=SITO&id_module=25', @@ -249,8 +250,24 @@ class AccueilControllerConfigSitothequePostTest extends Admin_AbstractController $this->assertEquals('0', Class_Profil::find(1)->getModuleAccueilConfig(25,'SITO')['preferences']['group_by_categorie']); + } + + + /** @test */ + public function selectDisplayShouldNotForceGroupByCategoryToFalse() { + $this->postDispatch('/admin/accueil/sitotheque?config=accueil&id_profil=1&type_module=SITO&id_module=25', + [ + 'type_aff' => 1, + 'nb_aff' => 2, + 'group_by_categorie' => true, + 'id_categorie' => '12-17' + ]); + + $this->assertEquals(true, Class_Profil::find(1)->getModuleAccueilConfig(25,'SITO')['preferences']['group_by_categorie']); } + + /** @test */ public function selectHierachicalDisplayWithEmptyCategoriesShouldSaveOnlyFirstCategory() { $this->postDispatch('/admin/accueil/sitotheque?config=accueil&id_profil=1&type_module=SITO&id_module=25', @@ -264,9 +281,11 @@ class AccueilControllerConfigSitothequePostTest extends Admin_AbstractController $this->assertEquals('',Class_Profil::find(1)->getModuleAccueilConfig(25,'SITO')['preferences']['id_categorie']); } +} + + -} class AccueilControllerConfigSitothequeDefaultsTest extends Admin_AbstractControllerTestCase { public function setUp() { parent::setUp();