diff --git a/VERSIONS_HOTLINE/160957 b/VERSIONS_HOTLINE/160957 new file mode 100644 index 0000000000000000000000000000000000000000..a3bf2ac5c49d8dcd977e93cdf0a3708cfe3eb96b --- /dev/null +++ b/VERSIONS_HOTLINE/160957 @@ -0,0 +1 @@ + - correctif #160957 : Agenda, lorsqu'un filtre est sélectionné, puis clic sur un article, correction du mode d'affichage en non-ajax \ No newline at end of file diff --git a/library/templates/Intonation/Library/View/Wrapper/Article.php b/library/templates/Intonation/Library/View/Wrapper/Article.php index 79cf67d2c6dae32db903c90a9eb3396aa9a840a5..241920862ec90f325a00c4ffe6fbb3c7e4c4ce39 100644 --- a/library/templates/Intonation/Library/View/Wrapper/Article.php +++ b/library/templates/Intonation/Library/View/Wrapper/Article.php @@ -52,7 +52,7 @@ class Intonation_Library_View_Wrapper_Article extends Intonation_Library_View_Wr public function getMainLink() { return (new Intonation_Library_Link) - ->setUrl($this->_model->getUrl()) + ->setUrl(Class_Url::relative($this->_model->getUrl())) ->setImage($this->getIco('read-document', 'library')) ->setText($this->_('Lire la suite')) ->setScreenReaderText($this->_getMainLinkTitle()); diff --git a/tests/scenarios/Templates/TemplatesAgendaTest.php b/tests/scenarios/Templates/TemplatesAgendaTest.php index 352829dabb4ae4de86659e064e257d859c38399d..2a1821e693592a7f14dab838728e9360693d877d 100644 --- a/tests/scenarios/Templates/TemplatesAgendaTest.php +++ b/tests/scenarios/Templates/TemplatesAgendaTest.php @@ -692,7 +692,8 @@ class TemplatesAgendaWallModeSelectedMonthIsCurrentMonthArticleWithoutEndDateTes /** @test */ public function parlezVousFrançaisShouldBePresent() { - $this->assertXPathContentContains('//div[@class="calendar"]//a', 'Parlez-vous français ?'); + $this->assertXPathContentContains('//div[@class="calendar"]//a', + 'Parlez-vous français ?'); } @@ -700,6 +701,12 @@ class TemplatesAgendaWallModeSelectedMonthIsCurrentMonthArticleWithoutEndDateTes public function heureShouldNotBePresent() { $this->assertNotXPathContentContains('//div[@class="calendar"]//span', 'à 00:00'); } + + + /** @test */ + public function pageShouldContainsLinkToCmsArticleViewIdSevenWithoutContext() { + $this->assertXPath('//a[@href="/cms/articleview/id/7"]'); + } } @@ -719,4 +726,4 @@ class TemplatesAgendaRenderAllTest extends TemplatesAgendaTestCase { $this->dispatch('/opac/cms/render-all/id_module/1'); $this->assertXPathCount('//div[@class="calendar"]//a[@class="calendar_title_month_clickable text-secondary"]', 2); } -} \ No newline at end of file +} diff --git a/tests/scenarios/Templates/TemplatesArticlesTest.php b/tests/scenarios/Templates/TemplatesArticlesTest.php index e91f80e2c2afaf2a811b44eb4dc5c97db61436eb..dd1320bba510babe35d5eae205175f262d0deb4b 100644 --- a/tests/scenarios/Templates/TemplatesArticlesTest.php +++ b/tests/scenarios/Templates/TemplatesArticlesTest.php @@ -249,7 +249,7 @@ class TemplatesArticlesWidgetTest extends TemplatesArticlesWidgetTestCase { /** @test */ public function articleLinkTitleShouldContainsEventDebut() { - $this->assertXPathContentContains('//a[@href="/cms/articleview/id_profil/1/id/12"]//span[@class="sr-only"]', + $this->assertXPathContentContains('//a[@href="/cms/articleview/id/12"]//span[@class="sr-only"]', 'Lire l\'article: Parlez-vous vraiment français ? 12/04/2020'); } } @@ -1288,4 +1288,4 @@ class TemplatesArticlesCarouselFromCKEditorInMediaDivTest public function articleSprechenSieDeutschMediaShouldHaveAKiosque() { $this->assertXPath('//div[@class="list-group bg-transparent no_border"]//div[@class="card card_template card_Intonation_Library_View_Wrapper_Article"]//div[@class="card-img-top text-center"]//div[@class="boite kiosque widget col card"]'); } -} \ No newline at end of file +}