From 48e1716a8a5c0bd7de2de7f76fd12c8f18c88715 Mon Sep 17 00:00:00 2001
From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
Date: Mon, 17 Feb 2020 12:29:19 +0000
Subject: [PATCH] Bug 23173: (follow-up) Allow for customisable display name

We now allow for the service to return a name that can be specified in
the plugin config. This patch switches to using that, rather than just
the plugin name defined in the plugin's metadata hashref

Signed-off-by: Niamh Walker-Headon <Niamh.Walker-Headon@tudublin.ie>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../intranet-tmpl/prog/en/includes/ill-availability-table.inc | 1 -
 koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt   | 4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-availability-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-availability-table.inc
index 3cd00e709d..69e6679edc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-availability-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-availability-table.inc
@@ -1,5 +1,4 @@
 <div>
-    <div>[% service.name %]</div>
     <table class="ill-availability" id="[% service.id %]">
         <thead id="[% service.id %]-header">
             <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
index fac382c4a7..e2166f89d9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -329,7 +329,7 @@
                                         </div>
                                         <div class="modal-body">
                                             [% FOR service IN services %]
-                                                <h4 class="ill_availability_sourcename">[% service.plugin %]</h4>
+                                                <h4 class="ill_availability_sourcename">[% service.name %]</h4>
                                                 [% INCLUDE 'ill-availability-table.inc' service=service %]
                                             [% END %]
                                             <span id="service_id_restrict" data-service_id_restrict_plugin="ILL availability - z39.50" data-service_id_restrict_ids=""></span>
@@ -744,7 +744,7 @@
                             </div>
                         </form>
                         [% FOR service IN services %]
-                            <h4 class="ill_availability_sourcename">[% service.plugin %]</h4>
+                            <h4 class="ill_availability_sourcename">[% service.name %]</h4>
                             [% INCLUDE 'ill-availability-table.inc' service=service %]
                         [% END %]
                     </div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
index a2b0571329..77fa2aaa22 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
@@ -251,7 +251,7 @@
                                 </div>
                             </form>
                             [% FOR service IN services %]
-                                <h4 class="ill_availability_sourcename">[% service.plugin %]</h4>
+                                <h4 class="ill_availability_sourcename">[% service.name %]</h4>
                                 [% INCLUDE 'ill-availability-table.inc' service=service %]
                             [% END %]
                         </div>
-- 
2.39.5