diff --git a/application/modules/opac/controllers/CmsController.php b/application/modules/opac/controllers/CmsController.php index 5e619503ea9a0687c9224da8997dd1921d9f5bf5..d8b651ee58336db00adfe96b9c4019aa4e193c61 100644 --- a/application/modules/opac/controllers/CmsController.php +++ b/application/modules/opac/controllers/CmsController.php @@ -49,7 +49,7 @@ class CmsController extends Zend_Controller_Action { $preferences['id_bib'] = $this->_getParam('b'); $preferences['display_order'] = 'EventDebut'; $preferences['events_only'] = true; - $preferences['published'] = false; + $preferences['published'] = !(bool)$preferences['event_date']; if ($id_cat = (int)$this->_getParam('select_id_categorie')) $preferences['id_categorie'] = $id_cat; diff --git a/tests/application/modules/opac/controllers/CmsControllerTest.php b/tests/application/modules/opac/controllers/CmsControllerTest.php index 47fd27689d13bba756b093e19f5a244e4a0c1736..18600618b31ff0c67c5c134710ed18efbd571ec1 100644 --- a/tests/application/modules/opac/controllers/CmsControllerTest.php +++ b/tests/application/modules/opac/controllers/CmsControllerTest.php @@ -311,6 +311,41 @@ class CmsControllerArticleViewByDateCategorie23AndNoProfilParamTest extends Abst + +class CmsControllerArticleViewByDateWitoutEventDateTest extends AbstractControllerTestCase { + protected $_article_loader; + + public function setUp() { + parent::setUp(); + + $this->_article_loader = Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Article') + ->whenCalled('getArticlesByPreferences') + ->with(['event_date' => null, + 'id_bib' => null, + 'display_order' => 'EventDebut', + 'events_only' => true, + 'published' => true]) + ->answers([Class_Article::newInstanceWithId(1) + ->setTitre('Corrige le clic sur le bandeau de la boite calendrier qui affichait les articles non publiés') + ->setCategorie(Class_ArticleCategorie::getLoader()->newInstanceWithId(1) + ->setLibelle('Bugs') + ->setBib(Class_Bib::newInstanceWithId(1)->setLibelle('Annecy'))) + ]); + + + $this->dispatch('/cms/articleviewbydate/id_module/8/id_profil/2'); + } + + + /** @test */ + public function articleCorrigeCalendirerShouldBePresent() { + $this->assertXpathContentContains('//ul//li//a', 'Corrige le clic'); + } +} + + + + abstract class CmsControllerWithFeteDeLaFriteTestCase extends AbstractControllerTestCase { public function setUp() { parent::setUp();