From 144bbe309b69c06012cb902c087e038e11ec26a2 Mon Sep 17 00:00:00 2001
From: efalcy <efalcy@afi-sa.fr>
Date: Fri, 23 Jan 2015 18:12:22 +0100
Subject: [PATCH] =?UTF-8?q?sandbox=20fusion=20:=20possibilit=C3=A9=20d'app?=
=?UTF-8?q?eler=20un=20sous=20modele=20(notice->article)=20dans=20un=20mod?=
=?UTF-8?q?ele,=20affichage=20du=20bouton=20"imprimer"=20si=20le=20nom=20d?=
=?UTF-8?q?'un=20modele=20de=20fusion=20s'appelle=20"recherche"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../scripts/recherche/resultatRecherche.phtml | 12 ++++-
library/Class/Article.php | 1 +
library/Class/ModeleFusion.php | 48 +++++++++++++++++--
library/Class/Notice.php | 9 +++-
library/ZendAfi/Form/ModeleFusion.php | 20 ++++----
.../controllers/RechercheControllerTest.php | 44 +++++++++++++----
6 files changed, 111 insertions(+), 23 deletions(-)
diff --git a/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml b/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml
index 3d32cf2e566..e241c10688b 100644
--- a/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml
+++ b/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml
@@ -16,8 +16,16 @@ if ($this->is_pertinence) {
$this->titre .= $this->_(" (recherche élargie triée par pertinence)");
}
?>
-<div class="print"><a href="<?php echo $this->url(['action' => 'print',
- 'modele_fusion' => Class_ModeleFusion::findAll()[0]->getId()]); ?>">imprimer</a></div>
+<div class="print">
+<?php
+if ($fusion=Class_ModeleFusion::findFirstBy(['nom' => 'recherche'])) {
+?>
+<a href="<?php echo $this->url(['action' => 'print',
+ 'modele_fusion' => $fusion->getId()]); ?>">imprimer</a>
+
+
+<?php } ?>
+</div>
<div class="resultats_page">
<?php
echo $this->tagTriRecherche($this->criteres_recherche);
diff --git a/library/Class/Article.php b/library/Class/Article.php
index 8c01ef33273..917b880cfda 100644
--- a/library/Class/Article.php
+++ b/library/Class/Article.php
@@ -891,6 +891,7 @@ class Class_Article extends Storm_Model_Abstract {
* @return string
*/
public function getContenu() {
+ xdebug_break();
$contenu = parent::_get('contenu');
$quote = '[\"\']';
diff --git a/library/Class/ModeleFusion.php b/library/Class/ModeleFusion.php
index 74cab77c590..3452710ea2a 100644
--- a/library/Class/ModeleFusion.php
+++ b/library/Class/ModeleFusion.php
@@ -42,7 +42,11 @@ class Class_ModeleFusion extends Storm_Model_Abstract {
public function getDataSourceNamed($name) {
- return array_at($name, $this->getDataSource());
+ $this->dataSource=array_at($name, $this->getDataSource());
+ return $this->dataSource;
+ if (!$this->dataSource)
+ return $this->dataSource=array_at($name, $this->getDataSource());
+ return $this->dataSource->callGetterByAttributeName($name);
}
@@ -87,6 +91,11 @@ class Class_ModeleFusion extends Storm_Model_Abstract {
public function getTagValueForInstance($match,$instance) {
if (strpos($match,'.') === false)
return $instance->callGetterByAttributeName($match);
+ else {
+ return $this->getTagValueForCollectionInstance($match,$instance);
+ $match = explode('.',$match);
+ array_shift($match);
+ }
if (!$instance->callGetterByAttributeName($match))
return '';
$matches = substr($match,0,strpos($match,'.'));
@@ -97,11 +106,43 @@ class Class_ModeleFusion extends Storm_Model_Abstract {
}
+ public function getTagValueForCollectionInstance($match,$instance) {
+ $attributes=$match;
+ xdebug_break();
+ if (is_array($match))
+ $attributes = array_filter(explode('.',array_shift($match)));
+ else
+ if (strpos($match,'.')) {
+ $attributes = array_filter(explode('.',$match));
+ }
+
+ else $attributes =[ $match];
+ xdebug_break();
+ $model = $instance->callGetterByAttributeName(array_shift($attributes));
+ if (!$model)
+ return '';
+ if (is_array($value = $this->getValue($model, $attributes)))
+ return $this->buildSection($value,array_shift($match));
+// return $this->buildTable($value, array_shift($match));
+
+ return $this->htmlize($value);
+ }
+
+
public function getTagValueForString($match) {
- $attributes = explode('.',array_shift($match));
+ $attributes=$match;
+ xdebug_break();
+ if (is_array($match))
+ $attributes = array_filter(explode('.',array_shift($match)));
+ else
+ if (strpos($match,'.')) {
+ $attributes = array_filter(explode('.',$match));
+ }
- $model = $this->getDataSourceNamed(array_shift($attributes));
+ else $attributes =[ $match];
xdebug_break();
+ $model = $this->getDataSourceNamed(array_shift($attributes));
+
if (is_array($value = $this->getValue($model, $attributes)))
return $this->buildSection($value,array_shift($match));
// return $this->buildTable($value, array_shift($match));
@@ -111,6 +152,7 @@ class Class_ModeleFusion extends Storm_Model_Abstract {
public function htmlize($value) {
+ return $value;
//php 5.4 - 5.2 compat
if (!$in_utf8 = htmlentities($value, ENT_QUOTES, 'UTF-8'))
return htmlentities($value, ENT_QUOTES);
diff --git a/library/Class/Notice.php b/library/Class/Notice.php
index b4d4b1e58b1..018426ac4cd 100644
--- a/library/Class/Notice.php
+++ b/library/Class/Notice.php
@@ -373,7 +373,9 @@ class Class_Notice extends Storm_Model_Abstract {
return parent::setUnimarc($unimarc);
}
-
+ public function getFetchUrlVignette() {
+ return $this->fetchUrlVignette();
+ }
public function fetchUrlVignette() {
$url = $this->getUrlVignette();
@@ -1733,6 +1735,11 @@ class Class_Notice extends Storm_Model_Abstract {
->setFacettes(implode(' ', array_unique($facettes)))
->setDateCreation($date_nouveaute);
}
+
+ public function getArticle() {
+ xdebug_break();
+ return Class_Article::findFirstBy(['id_notice' => $this->getId()]);
+ }
}
?>
\ No newline at end of file
diff --git a/library/ZendAfi/Form/ModeleFusion.php b/library/ZendAfi/Form/ModeleFusion.php
index d280db7bfcb..45a6aa92bf0 100644
--- a/library/ZendAfi/Form/ModeleFusion.php
+++ b/library/ZendAfi/Form/ModeleFusion.php
@@ -24,8 +24,7 @@ class ZendAfi_Form_ModeleFusion extends ZendAfi_Form {
public static function newWith($datas=[], $custom_form=null) {
$form_name='MODELE_FUSION';
-// $modele_fusion = Class_ModeleFusion::get($form_name);
-// if (!$modele_fusion)
+
if (!$datas)
$datas= (new Class_ModeleFusion())->toArray();
@@ -33,17 +32,20 @@ class ZendAfi_Form_ModeleFusion extends ZendAfi_Form {
$form->setMethod('post')
->addElement('text',
'nom',
- ['label' => 'Nom'])
+ ['label' => 'Nom',
+ 'required' => true,
+ 'allowEmpty' => false])
->addElement('ckeditor',
'contenu',
+ [
+ 'label' => '',
+ 'value' => $datas['contenu'],
+ 'required' => true,
+ 'allowEmpty' => false]);
- array(
- 'label' => $datas['nom'],
- 'value' => $datas['contenu'],
- 'required' => true,
- 'allowEmpty' => false));
-
+ $form->populate($datas);
return $form;
+
}
}
diff --git a/tests/application/modules/opac/controllers/RechercheControllerTest.php b/tests/application/modules/opac/controllers/RechercheControllerTest.php
index f764ffc56be..f84c8fce80d 100644
--- a/tests/application/modules/opac/controllers/RechercheControllerTest.php
+++ b/tests/application/modules/opac/controllers/RechercheControllerTest.php
@@ -2741,29 +2741,57 @@ class RechercheControlleSimpleActionWithEmptyDomainSettingsAndArticlesLinkedTest
class RechercheControllerPrintActionTest extends AbstractControllerTestCase {
public function setUp() {
parent::setUp();
+ Class_Article::beVolatile();
+ Class_Notice::beVolatile();
+/* $record = $this->fixture('Class_Notice',['id'=> 10,
+ 'titre_principal' => 'Le photographe',
+ 'url_vignette' => 'photographe.jpg',
+ 'auteur_principal' => 'Guibert']);
+
+
+ $record2 = $this->fixture('Class_Notice',['id'=> 12,
+ 'titre_principal' => 'Transmetropolitan',
+ 'auteur_principal' => 'Ellis']);
+
+*/
$this->fixture('Class_ModeleFusion', ['id' => 1,
'nom' => 'pomme',
- 'contenu' => '<p> {moteurRecherche_resultat.notices[<img src="{url_vignette}"/> {titre_principal} {article_cms.contenu}
+ 'contenu' => '<p> {moteurRecherche_resultat.notices[<img src="{url_vignette}"/> {titre_principal} <div>{article.contenu}</div>
]}</p>']);
Class_Indexation_PseudoNotice::index( $this->fixture('Class_Article' , ['id' => 10,
'titre' => 'pomme',
- 'contenu' => 'blabla',
+ 'contenu' => '<p>blabla</p>',
+ //'notice' => $record,
+ 'notice' => new Class_Notice(),
+ 'type_doc_id' => Class_TypeDoc::ARTICLE]));
+
+
+ Class_Indexation_PseudoNotice::index( $this->fixture('Class_Article' , ['id' => 12,
+ 'titre' => 'transmetropolitan',
+ 'contenu' => '<p>bd</p>',
'notice' => new Class_Notice(),
'type_doc_id' => Class_TypeDoc::ARTICLE]));
+
+ Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Notice')
+ ->whenCalled('findAllByRequeteRecherche')
+ ->with("Select id_notice, MATCH(alpha_titre) AGAINST(' POMME') as rel1, MATCH(alpha_auteur) AGAINST(' POMME') as rel2 from notices Where MATCH(titres, auteurs, editeur, collection, matieres, dewey) AGAINST('+(POMME POMMES POM)' IN BOOLEAN MODE) order by (rel1 * 1.5) + (rel2) desc",
+ 10,1)
+ ->answers(Class_Notice::findAll())
+ ->beStrict();
+
$this->dispatch("/recherche/print/expressionRecherche/pomme/modele_fusion/1",true);
}
/** @test */
- public function displayShouldprintTitle() {
-
- $this->assertXPathContentContains("//p", "pomme",$this->_response->getBody());
+ public function displayShouldprintContent() {
+ $this->assertXPathContentContains("//div//p", "bd",$this->_response->getBody());
}
-/** @test */
- public function contenuShouldContains() {
- $this->assertXPathContentContains("//p", "blabla",$this->_response->getBody());
+ /** @test */
+ public function contenuShouldContainsTransmetropolitan() {
+ $this->assertXPathContentContains("//div", "transmetropolitan",$this->_response->getBody());
}
}
--
GitLab