diff --git a/library/ZendAfi/Controller/Plugin/Mailer/SearchResult.php b/library/ZendAfi/Controller/Plugin/Mailer/SearchResult.php
index d80473ed34e259f0873ac5151454138269962561..b50076ad2ac8a213ea718f915626409cbeb09872 100644
--- a/library/ZendAfi/Controller/Plugin/Mailer/SearchResult.php
+++ b/library/ZendAfi/Controller/Plugin/Mailer/SearchResult.php
@@ -23,8 +23,9 @@
class ZendAfi_Controller_Plugin_Mailer_SearchResult extends ZendAfi_Controller_Plugin_Mailer_ModelFusion {
protected function _getSubject() {
- return $this->_('Résultat de recherche : %s',
- $this->_getParam('expressionRecherche', $this->_getParam('serie', parent::_getSubject())));
+ return $this->_('%s : Documents %s',
+ Class_Profil::getCurrentProfil()->getTitreSite(),
+ $this->_getParam('subject', parent::_getSubject()));
}
diff --git a/library/ZendAfi/View/Helper/ModeleFusion/Link.php b/library/ZendAfi/View/Helper/ModeleFusion/Link.php
index 077555eac9cbb8f3dab92e913c03857aff450ee9..476952bb4dc12f0441fd083c7b28c50ff0f50e2f 100644
--- a/library/ZendAfi/View/Helper/ModeleFusion/Link.php
+++ b/library/ZendAfi/View/Helper/ModeleFusion/Link.php
@@ -45,6 +45,7 @@ class ZendAfi_View_Helper_ModeleFusion_Link extends ZendAfi_View_Helper_BaseHel
return $this->view->tagAnchor($this->view->url( ['action' => $instance->getAction(),
'ids' => $ids,
+ 'subject' => $instance->getSubject(),
'strategy' => $instance->getStrategy(),
'modele_fusion' => $model_fusion->getId()]),
$instance->getLink(),
diff --git a/library/ZendAfi/View/Helper/Search/Header.php b/library/ZendAfi/View/Helper/Search/Header.php
index f84286f82306a30b069ed4a7e23339a497929734..41b4156e0c5e8b65cc61bb2a5b88cdd8ff24ae80 100644
--- a/library/ZendAfi/View/Helper/Search/Header.php
+++ b/library/ZendAfi/View/Helper/Search/Header.php
@@ -21,7 +21,8 @@
class ZendAfi_View_Helper_Search_Header extends ZendAfi_View_Helper_BaseHelper {
- protected $_criteria,
+ protected
+ $_criteria,
$_search_result,
$_settings;
@@ -74,6 +75,7 @@ class ZendAfi_View_Helper_Search_Header extends ZendAfi_View_Helper_BaseHelper {
protected function _tagSearchActions() {
$instance = (new Class_Entity())
+ ->setSubject(strip_tags($this->view->tagSearchTerm($this->_criteria)))
->setModels($this->_search_result->fetchRecords())
->setIds(implode(';', array_slice($this->_search_result->fetchAllRecordsIds(), 0, 200)))
->setStrategy('Notice_List');
diff --git a/library/ZendAfi/View/Helper/TagSearchTerm.php b/library/ZendAfi/View/Helper/TagSearchTerm.php
new file mode 100644
index 0000000000000000000000000000000000000000..2ef9b6202ebf4da7959e2be175e59ee791079bea
--- /dev/null
+++ b/library/ZendAfi/View/Helper/TagSearchTerm.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright (c) 2012-2017, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * 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
+ */
+
+
+class ZendAfi_View_Helper_TagSearchTerm extends ZendAfi_View_Helper_BaseHelper {
+ public function tagSearchTerm($criteres_recherche) {
+ if($term = $this->_getInputOrStaticSearchTerm($criteres_recherche))
+ return $this->_('pour : %s', $this->_addClassExpressionRecherche($term));
+
+ if($domain = $criteres_recherche->getCatalogue())
+ return $this->_('dans le catalogue : %s',
+ $this->_addClassExpressionRecherche($domain->getLibelle()));
+
+ if($selection = $criteres_recherche->getPanier())
+ return $this->_('dans le panier : %s',
+ $this->_addClassExpressionRecherche($selection->getLibelle()));
+
+ if($serie = $criteres_recherche->getSerie())
+ return $this->_('dans la serie : %s',
+ $this->_addClassExpressionRecherche($serie));
+
+ return '';
+ }
+
+
+ protected function _getInputOrStaticSearchTerm($criteres_recherche) {
+ if (!Class_Profil::getCurrentProfil()->isSearchTermEditable())
+ return $this->view->escape($criteres_recherche->getExpressionRecherche());
+
+ $expression = $criteres_recherche->getExpressionRecherche();
+ $input = $this->view->formText('expressionRecherche',
+ $expression,
+ ['class' => 'expressionRecherche',
+ 'placeholder' => $expression]);
+ return $this->view->tag('form',
+ $input,
+ ['method' => 'get',
+ 'style' => 'display: inline-block',
+ 'action' => $this->view->url(['expressionRecherche' => null])]);
+ }
+
+
+ protected function _addClassExpressionRecherche($expression_recherche) {
+ return $this->_tag('div', $expression_recherche, ['class' => 'expression-recherche']);
+ }
+
+}
+?>
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/TagTitreEtNombreDeResultats.php b/library/ZendAfi/View/Helper/TagTitreEtNombreDeResultats.php
index 1b9f001c84b02d9116dcd70a6b168089dc31e9a5..29d3a400a492078ed3826fcd2dd104325301967d 100644
--- a/library/ZendAfi/View/Helper/TagTitreEtNombreDeResultats.php
+++ b/library/ZendAfi/View/Helper/TagTitreEtNombreDeResultats.php
@@ -23,7 +23,7 @@ class ZendAfi_View_Helper_TagTitreEtNombreDeResultats extends ZendAfi_View_Helpe
public function tagTitreEtNombreDeResultats($search_result){
$search_duration = $search_result->getDuration();
$criteres_recherche = $search_result->getCriteresRecherche();
- $expression_recherche = $this->_getExpressionRecherche($criteres_recherche);
+ $expression_recherche = $this->view->tagSearchTerm($criteres_recherche);
$nombre_resultats = $search_result->getRecordsCount();
@@ -46,11 +46,10 @@ class ZendAfi_View_Helper_TagTitreEtNombreDeResultats extends ZendAfi_View_Helpe
$this->view->_('S\'abonner à cette recherche'));
$html.= $this->_tag('div',
- $plural_expression .
- ' ' .
- $expression_recherche .
- ' ' .
- $this->_tag('small', $this->_('(%1.2f secondes)', $search_duration)),
+ sprintf('%s %s %s',
+ $plural_expression,
+ $expression_recherche,
+ $this->_tag('small', $this->_('(%1.2f secondes)', $search_duration))),
['class' => 'search-sentence']);
return $this->_tag('div',
@@ -58,54 +57,9 @@ class ZendAfi_View_Helper_TagTitreEtNombreDeResultats extends ZendAfi_View_Helpe
['class' => 'info-recherche']);
}
- protected function _getInputOrStaticSearchTerm($criteres_recherche) {
- if (!Class_Profil::getCurrentProfil()->isSearchTermEditable())
- return $this->view->escape($criteres_recherche->getExpressionRecherche());
-
- $expression = $criteres_recherche->getExpressionRecherche();
- $input = $this->view->formText('expressionRecherche',
- $expression,
- ['class' => 'expressionRecherche',
- 'placeholder' => $expression]);
- $form = $this->view->tag('form',
- $input,
- ['method' => 'get',
- 'style' => 'display: inline-block',
- 'action' => $this->view->url(['expressionRecherche' => null])]);
-
-
- return $form;
-
- }
-
protected function _islimited($count, $limit) {
return $limit && ($count == $limit);
}
-
-
- protected function _getExpressionRecherche( $criteres_recherche ) {
-
- $expression_critere_recherche = $this->_getInputOrStaticSearchTerm($criteres_recherche);
-
- $expression=$this->view->_('pour : ');
- $catalogue=$this->view->_('dans le catalogue : ');
- $panier=$this->view->_('dans le panier : ');
-
- $expression_recherche =$expression.$this->_addClassExpressionRecherche($expression_critere_recherche);
-
- if(!$expression_critere_recherche){
- if($criteres_recherche->getCatalogue())
- $expression_recherche = $catalogue.$this->_addClassExpressionRecherche($criteres_recherche->getCatalogue()->getLibelle());
- if($criteres_recherche->getPanier())
- $expression_recherche = $panier.$this->_addClassExpressionRecherche($criteres_recherche->getPanier()->getLibelle());
- }
-
- return $expression_recherche;
- }
-
- protected function _addClassExpressionRecherche($expression_recherche) {
- return $this->_tag('div', $expression_recherche, ['class' => 'expression-recherche']);
- }
}
?>
\ No newline at end of file
diff --git a/tests/scenarios/Mailer/MailerTest.php b/tests/scenarios/Mailer/MailerTest.php
index efc69ac3c052438ba5130e13e5b7d2edf5b505f9..4f5949d30c998d0c1b23b84866ea0d266b40e944 100644
--- a/tests/scenarios/Mailer/MailerTest.php
+++ b/tests/scenarios/Mailer/MailerTest.php
@@ -51,8 +51,8 @@ class MailerSearchResultSimpleTest extends AbstractControllerTestCase {
/** @test */
public function subjectShouldBeIlEtaitUneFoisDansLOuest() {
- $this->dispatch('/recherche/send-mail/expressionRecherche/il+%C3%A9tait+une+fois+dans+l%27ouest/tri/%2A/code_rebond/A26874/ids/6731%3B6877%3B6917%3B7528%3B7574%3B8648%3B11793%3B11972%3B13994%3B14010/strategy/Notice_List/modele_fusion/6', true);
- $this->assertXPath('//form//input[@type="text"][@value="Résultat de recherche : il était une fois dans l\'ouest"]');
+ $this->dispatch('/recherche/send-mail/expressionRecherche/il+%C3%A9tait+une+fois+dans+l%27ouest/tri/%2A/code_rebond/A26874/ids/6731%3B6877%3B6917%3B7528%3B7574%3B8648%3B11793%3B11972%3B13994%3B14010/strategy/Notice_List/modele_fusion/6/subject/il+%C3%A9tait+une+fois+dans+l%27ouest', true);
+ $this->assertXPath('//form//input[@type="text"][@value="PHP Unit : Documents il était une fois dans l\'ouest"]');
}
}
@@ -99,6 +99,6 @@ class MailerLinkInSearchResultTest extends AbstractControllerTestCase {
/** @test */
public function shareByMAilShouldBePresent() {
- $this->assertXPath('//div//a[contains(@href, "/recherche/send-mail/")]');
+ $this->assertXPath('//div//a[@href = "/recherche/send-mail/expressionRecherche/seven+deadly+sins/ids/68463%3B68464%3B68465%3B68466%3B102100/subject/pour+%3A+/strategy/Notice_List/modele_fusion/6"]');
}
}
\ No newline at end of file