diff --git a/library/ZendAfi/View/Helper/Article/RenderTitleOnlyCalendarWithCatalogue.php b/library/ZendAfi/View/Helper/Article/RenderTitleOnlyCalendarWithCatalogue.php index 9d5f11f215fbb2369897d5ca687fa4bb3f2d3cd4..cfd71ac7963a48955aa9b2b19cdc3b128c8e710c 100644 --- a/library/ZendAfi/View/Helper/Article/RenderTitleOnlyCalendarWithCatalogue.php +++ b/library/ZendAfi/View/Helper/Article/RenderTitleOnlyCalendarWithCatalogue.php @@ -16,17 +16,17 @@ * * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE * along with BOKEH; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ class ZendAfi_View_Helper_Article_RenderTitleOnlyCalendarWithCatalogue extends ZendAfi_View_Helper_Article_RenderTitleOnlyCalendar { - + public function article_RenderTitleOnlyCalendarWithCatalogue($article) { return $this->article_RenderTitleOnlyCalendar($article); } - - - public function renderCalendarEventInfo($article) { - return + + + public function renderCalendarEventInfo($article, $id_module = null) { + return $this->view->tagAnchor($this->view->url(['controller' => 'cms', 'action' => 'articleviewbydate', 'cat' => $article->getIdCat()],null,true), diff --git a/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php b/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php index f0a8018d97eef21a1613006a0212c88260be5f0e..ed3a49018afd2504c416752a3b9a67964de5b8d0 100644 --- a/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php +++ b/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php @@ -1626,7 +1626,7 @@ abstract class ProfilOptionsControllerProfilBoiteCalendarTestCase extends Abstra $category = $this->fixture('Class_ArticleCategorie', ['id' => 12, - 'libelle' => 'my library cat', + 'libelle' => 'Fiesta à Annecy', 'bib' => $bib]); $article = $this->fixture('Class_Article', @@ -1761,7 +1761,7 @@ class ProfilOptionsControllerProfilBoiteCalendarWithCalendarDisplayedWithModeSim ->setLibelle('Profil Portail') ->setCfgAccueil($cfg_accueil); - $this->dispatch('/opac'); + $this->dispatch('/opac', true); } diff --git a/tests/library/ZendAfi/View/Helper/Accueil/CalendarTest.php b/tests/library/ZendAfi/View/Helper/Accueil/CalendarTest.php index 762ea40ec289531a7e51baa9393e9f9af4f29d50..90fc393dc5fd3e70b19c8d89848fc8606d57fb44 100644 --- a/tests/library/ZendAfi/View/Helper/Accueil/CalendarTest.php +++ b/tests/library/ZendAfi/View/Helper/Accueil/CalendarTest.php @@ -549,7 +549,7 @@ class CalendarWithCategoryLimitAndBibPreferencesTest extends CalendarViewHelperT /** @test */ function calendarEventListShouldContainsBibCran() { $this->assertXPathContentContains($this->html, - '//a[@class="calendar_event_info"][contains(@href, "cms/articleviewbydate/b/5")]', + '//a[@class="calendar_event_info"][contains(@href, "cms/articleviewbydate/id_module/2/b/5")]', 'Cran Gevrier', $this->html); }