From efb2b0f6ee6ab1ac33fef0a74ad9771dee0bc623 Mon Sep 17 00:00:00 2001
From: efalcy <efalcy@afi-sa.fr>
Date: Fri, 30 Oct 2015 10:43:00 +0100
Subject: [PATCH] dev #32110 : display admin variable in popup + tests
---
.../scripts/bib-numerique/loan-book.phtml | 2 +-
.../ZendAfi/Form/Admin/AdminVar/Editor.php | 5 +++--
.../BibNumeriqueControllerDilicomTest.php | 21 ++++++++++++++++++-
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/application/modules/opac/views/scripts/bib-numerique/loan-book.phtml b/application/modules/opac/views/scripts/bib-numerique/loan-book.phtml
index 6dba570e25b..094af951736 100644
--- a/application/modules/opac/views/scripts/bib-numerique/loan-book.phtml
+++ b/application/modules/opac/views/scripts/bib-numerique/loan-book.phtml
@@ -5,6 +5,6 @@ echo $this->tagAnchor($this->url(['action' => 'download-loan-book-ajax']), $this
'class' => 'button blue']);
echo $this->tagAnchor('', $this->_('non'), ['onclick' => 'opacDialogClose();return false',
'class' => 'button red']);
-echo $this->tag('p', 'Votre compte sera mis à jour dans un délai de 15 minutes après le retour anticipé du document.');
+echo $this->tag('p', Class_AdminVar::getValueOrDefault('DILICOM_PNB_LOAN_WARNING_MESSAGE'));
echo '</div>';
?>
diff --git a/library/ZendAfi/Form/Admin/AdminVar/Editor.php b/library/ZendAfi/Form/Admin/AdminVar/Editor.php
index 6feb30babab..f812541e501 100644
--- a/library/ZendAfi/Form/Admin/AdminVar/Editor.php
+++ b/library/ZendAfi/Form/Admin/AdminVar/Editor.php
@@ -26,11 +26,12 @@ class ZendAfi_Form_Admin_AdminVar_Editor extends ZendAfi_Form_Admin_AdminVar {
public function addVariableEditElement() {
$this->addElement('ckeditor',
- 'valeur',
- ['label' => $this->_('Valeur')]);
+ 'valeur',
+ ['label' => $this->_('Valeur')]);
}
+
public function getAdminVarValue() {
return trim($this->getValues()['valeur']);
}
diff --git a/tests/application/modules/opac/controllers/BibNumeriqueControllerDilicomTest.php b/tests/application/modules/opac/controllers/BibNumeriqueControllerDilicomTest.php
index 441d4d3c4fd..a0aa0de6477 100644
--- a/tests/application/modules/opac/controllers/BibNumeriqueControllerDilicomTest.php
+++ b/tests/application/modules/opac/controllers/BibNumeriqueControllerDilicomTest.php
@@ -107,6 +107,8 @@ abstract class BibNumeriqueContollerDilicomTestCase extends AbstractControllerTe
class BibNumeriqueContollerDilicomAjaxPopupBookActionTest extends BibNumeriqueContollerDilicomTestCase {
+ protected $_storm_default_to_volatile = true;
+
/** @test */
public function popupConsultBookShouldContainsLinkToOpenAjax() {
$this->_http
@@ -156,7 +158,6 @@ class BibNumeriqueContollerDilicomAjaxPopupBookActionTest extends BibNumeriqueCo
}
-
/** @test */
public function loanBookPopupShouldContainsLinkToDownload() {
$this->dispatch('/bib-numerique/loan-book-ajax/id/3', true);
@@ -171,6 +172,24 @@ class BibNumeriqueContollerDilicomAjaxPopupBookActionTest extends BibNumeriqueCo
}
+ /** @test */
+ public function loanBookPopupShouldContainDefaultMessage() {
+ $this->dispatch('/bib-numerique/loan-book-ajax/id/3', true);
+ $this->assertContains('Votre compte sera mis à jour dans un délai de 15 minutes après le retour anticipé du document.', json_decode($this->_response->getBody())->content);
+ }
+
+
+ /** @test */
+ public function loanBookPopupShouldContainDefinedMessage() {
+ $this->fixture('Class_AdminVar',
+ ['id' => 'DILICOM_PNB_LOAN_WARNING_MESSAGE',
+ 'valeur' => 'Don\'t use this !'
+ ]);
+ $this->dispatch('/bib-numerique/loan-book-ajax/id/3', true);
+ $this->assertContains('Don\'t use this !', json_decode($this->_response->getBody())->content);
+ }
+
+
/** @test */
public function downloadLinkShouldAnswersDilicomLink() {
$this->_http
--
GitLab