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 6dba570e25be7628e8b5de3c3c4f9b6af8889088..094af95173656a593f2f3b5c40de5de29d931661 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 6feb30babab95e97548a227264875bc7d0f331e9..f812541e5010ffe31e62296e16cc4d4935c0493c 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 441d4d3c4fd61164cadd5f717f6a4d7f77ba817a..a0aa0de6477255cf8400944a1bcd5601f70f8eed 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