From 7ed1dff409b9b9fc65ceec4172e75b66e6de25e2 Mon Sep 17 00:00:00 2001
From: Laurent Laffont <llaffont@afi-sa.fr>
Date: Tue, 2 Nov 2021 11:22:03 +0100
Subject: [PATCH] dev #143671 Search by work with indexed pages : link to
work/page points directly to page url
---
VERSIONS_WIP/143671 | 1 +
library/Class/Notice/Permalink.php | 5 ++++
.../Intonation/Library/View/Wrapper/Work.php | 17 ++++++------
.../IndexablePagesSearchTest.php | 26 ++++++++++++++++++-
4 files changed, 40 insertions(+), 9 deletions(-)
create mode 100644 VERSIONS_WIP/143671
diff --git a/VERSIONS_WIP/143671 b/VERSIONS_WIP/143671
new file mode 100644
index 00000000000..90d63bfe558
--- /dev/null
+++ b/VERSIONS_WIP/143671
@@ -0,0 +1 @@
+ - ticket #143671 : Recherche par oeuvre : le lien vers l'oeuvre de type page/profil pointe directement sur la page/profil (au lieu de la vue des notices)
\ No newline at end of file
diff --git a/library/Class/Notice/Permalink.php b/library/Class/Notice/Permalink.php
index 71c3525ee88..64df2eddb88 100644
--- a/library/Class/Notice/Permalink.php
+++ b/library/Class/Notice/Permalink.php
@@ -27,6 +27,11 @@ class Class_Notice_Permalink {
}
+ public function relativeFor($record) {
+ return Class_Url::relative($this->paramsFor($record));
+ }
+
+
public function paramsFor($record) {
if (!$record)
return $this->_searchUrl();
diff --git a/library/templates/Intonation/Library/View/Wrapper/Work.php b/library/templates/Intonation/Library/View/Wrapper/Work.php
index 1f6966f4b86..9a791c53a6b 100644
--- a/library/templates/Intonation/Library/View/Wrapper/Work.php
+++ b/library/templates/Intonation/Library/View/Wrapper/Work.php
@@ -47,14 +47,16 @@ class Intonation_Library_View_Wrapper_Work extends Intonation_Library_View_Wrapp
public function getMainLink() {
- $params = array_merge($this->_widget_context_params,
- ['module' => 'opac',
- 'controller' => 'work',
- 'action' => 'view',
- 'id' => $this->_model->getId()]);
+ $url = (string)$this->_model->getTypeDoc() === Class_TypeDoc::PAGE
+ ? (new Class_Notice_Permalink)->relativeFor($this->_model)
+ : array_merge($this->_widget_context_params,
+ ['module' => 'opac',
+ 'controller' => 'work',
+ 'action' => 'view',
+ 'id' => $this->_model->getId()]);
return (new Intonation_Library_Link)
- ->setUrl($params)
+ ->setUrl($url)
->setImage($this->getIco('read-document', 'library'))
->setText($this->_('Voir'))
->setTitle($this->_('Voir l\'Å“uvre %s de %s',
@@ -159,7 +161,6 @@ class Intonation_Library_View_Wrapper_Work extends Intonation_Library_View_Wrapp
public function getOsmData() {}
-
public function getModelClassname() {
return get_class($this);
}
@@ -175,4 +176,4 @@ class Intonation_Library_View_Wrapper_Work extends Intonation_Library_View_Wrapp
public static function find($id) {
return Class_Notice_Work::loadWithFacets($id);
}
-}
\ No newline at end of file
+}
diff --git a/tests/scenarios/IndexablePages/IndexablePagesSearchTest.php b/tests/scenarios/IndexablePages/IndexablePagesSearchTest.php
index 5a55a0081fe..d16465162bd 100644
--- a/tests/scenarios/IndexablePages/IndexablePagesSearchTest.php
+++ b/tests/scenarios/IndexablePages/IndexablePagesSearchTest.php
@@ -43,7 +43,14 @@ class IndexablePagesSearchTest extends AbstractControllerTestCase {
$this
->mock()
->whenCalled('fetchAll')
- ->answers([ [1, 'Tbokeh_page'] ]));
+ ->answers([ [1, 'Tbokeh_page', 'METTONPASS--PORTAL-8'] ]));
+ }
+
+
+ /** @test */
+ public function firstRecordWorkKeyShouldBeMETTONPASS__PORTAL_8() {
+ $this->assertEquals('METTONPASS--PORTAL-8',
+ Class_Notice::find(1)->getClefOeuvre());
}
@@ -72,4 +79,21 @@ class IndexablePagesSearchTest extends AbstractControllerTestCase {
$this->dispatch('/recherche/simple/expressionRecherche/event/id_profil/34');
$this->assertXPath('//div[@class="img-thumbnail"]//i[contains(@class, "fas fa-pager")][contains(@class, "doc_type_bokeh_page")]');
}
+
+
+ /** @test */
+ public function withSearchByWorkAndTemplatingEnabledLinkToWorkShouldBeLinkToDTC() {
+ Class_AdminVar::set('TEMPLATING', 1);
+ Class_AdminVar::set('SEARCH_BY_WORK', 1);
+ $this->fixture(Class_Profil::class,
+ ['id' => 34,
+ 'template' => 'Muscle'])
+ ->setCfgModulesPreferences(['by_work' => 1],
+ 'recherche',
+ 'resultat',
+ 'simple');
+ $this->dispatch('/recherche/simple/expressionRecherche/event/by_work/1/id_profil/34');
+ $this->assertXPath('//div[contains(@class, "card_title_Intonation_Library_View_Wrapper_Work")]//a[text()="Met ton pass!"][@href="' . BASE_URL . '/dtc"]',
+ $this->_response->getBody());
+ }
}
--
GitLab