diff --git a/VERSIONS_HOTLINE/126711 b/VERSIONS_HOTLINE/126711 new file mode 100644 index 0000000000000000000000000000000000000000..b290866b356dccd4e8cc6b13e331ac5f8acb89d7 --- /dev/null +++ b/VERSIONS_HOTLINE/126711 @@ -0,0 +1 @@ + - ticket #126711 : Magasin de thèmes : Le résultat de recherche est trié en priorité avec la préférence de tri de l'utilisateur puis avec le paramètre de tri de la boite de recherche. \ No newline at end of file diff --git a/library/Class/CriteresRecherche.php b/library/Class/CriteresRecherche.php index 2ecab76edd26e4f1e43680569931bf7bea6891f8..10a3a34bd7ea3678635a9e77500cd49b22a18d9b 100644 --- a/library/Class/CriteresRecherche.php +++ b/library/Class/CriteresRecherche.php @@ -296,15 +296,15 @@ class Class_CriteresRecherche extends Class_CriteresRecherche_Abstract { public function getTri() { + if (($user_order = (new Class_User_Settings(Class_Users::getIdentity()))->getSearchOrder()) + && (isset($this->getListeTris()[$user_order]))) + return $user_order; + if ($tri = urldecode($this->getParam('tri', ''))) return isset($this->getListeTris()[$tri]) ? $tri : Class_CriteresRecherche::SORT_RELEVANCE; - if (($user_order = (new Class_User_Settings(Class_Users::getIdentity()))->getSearchOrder()) - && (isset($this->getListeTris()[$user_order]))) - return $user_order; - return $this->isRechercheCatalogue() ? self::SORT_PUBLICATION : static::SORT_RELEVANCE; diff --git a/tests/scenarios/Templates/TemplatesSearchTest.php b/tests/scenarios/Templates/TemplatesSearchTest.php index 131074caeb32a56e54ea0718df079089706595a5..d4559833a38c53d50842dd474a2b21c95d58cfdd 100644 --- a/tests/scenarios/Templates/TemplatesSearchTest.php +++ b/tests/scenarios/Templates/TemplatesSearchTest.php @@ -364,7 +364,7 @@ class TemplatesSearchDispatchIntonationSearchListFormatWallTest extends Template (new Class_User_Settings(Class_Users::getIdentity()))->setSearchOrder(Class_CriteresRecherche::SORT_AUTHOR_DESC)->save(); - $this->dispatch('/opac/recherche/simple/expressionRecherche/pomme/id_profil/72/liste_format/4/titre/Les documents'); + $this->dispatch('/opac/recherche/simple/expressionRecherche/pomme/id_profil/72/liste_format/4/titre/Les documents/tri/date_creation+asc%2C+alpha_titre+asc'); }