From b7acefa116c9ae1e738b5c53f30cf0d6c11d8784 Mon Sep 17 00:00:00 2001
From: Agustin Moyano <agustinmoyano@theke.io>
Date: Thu, 1 Jul 2021 21:00:31 -0300
Subject: [PATCH] Bug 27948: (follow-up) Use Koha.news and PROCESS
 koha_news_block to bring disclaimer

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../bootstrap/en/modules/opac-request-article.tt | 16 +++++++---------
 opac/opac-request-article.pl                     |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 opac/opac-request-article.pl

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
index fe44076b1a..8aa98eb5eb 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
@@ -1,7 +1,8 @@
 [% USE Koha %]
-[% USE raw %]
 [% USE Branches %]
 [% USE ItemTypes %]
+[% USE KohaNews %]
+[% USE raw %]
 [% INCLUDE 'doc-head-open.inc' %]
 
 <title>Request article &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
@@ -12,6 +13,8 @@
 [% INCLUDE 'bodytag.inc' bodyid='opac-request-article' %]
 [% INCLUDE 'masthead.inc' %]
 
+[% SET disclaimer = KohaNews.get( location => "ArticleRequestsDisclaimerText", lang => lang, library => branchcode ) %]
+
 <div class="main">
     <nav aria-label="breadcrumb">
         <ul class="breadcrumb">
@@ -32,14 +35,9 @@
             <div class="col">
                 [% IF biblio.can_article_request( patron ) %]
                     <h1>Place article request for [% biblio.title | html %]</h1>
-                    [% IF disclaimer %]
+                    [% IF ( disclaimer && !action) %]
                         <div class="alert alert-warning">
-                            [% FOREACH disc IN disclaimer %]
-                            <h3>[% disc.title | html %]</h3>
-                            <p>
-                                [% disc.content | $raw %]
-                            </p>
-                            [% END %]
+                            [% PROCESS koha_news_block news => disclaimer %]
                             <a href="/cgi-bin/koha/opac-request-article.pl?biblionumber=[% biblio.biblionumber | uri %]&amp;action=accept"
                             class="btn btn-sm btn-primary"><i class="fa fa-check" aria-hidden="true"></i> Accept</a>
                         </div>
@@ -52,7 +50,7 @@
 
 
                         <form id="place-article-request" method="post" action="/cgi-bin/koha/opac-request-article.pl">
-                        <legend class="sr-only">Place article request</legend>
+                            <legend class="sr-only">Place article request</legend>
                             <input type="hidden" name="action" value="create" />
                             <input type="hidden" name="biblionumber" id="biblionumber" value="[% biblio.biblionumber | html %]" />
 
diff --git a/opac/opac-request-article.pl b/opac/opac-request-article.pl
old mode 100755
new mode 100644
index 18cc70ef7f..38736e7f6f
--- a/opac/opac-request-article.pl
+++ b/opac/opac-request-article.pl
@@ -91,7 +91,7 @@ my $patron = Koha::Patrons->find($borrowernumber);
 $template->param(
     biblio => $biblio,
     patron => $patron,
-    disclaimer => $disclaimer
+    action => $action
 );
 
 output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 };
-- 
2.39.5