From d30a8ac8171f27bd22c251281128ddf059016ab6 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 15 Aug 2019 13:46:35 +0000
Subject: [PATCH] Bug 23455: Patron card printing from Patron lists is broken

This patch makes a few corrections to the process of printing patron
cards from the patron lists page. These changes are necessitated by Bug
20650: Changes to the markup in patroncards/print.tt were not reflected
in the JavaScript in patron_lists/lists.tt.

Also fixed: A missing quotation mark, a missing semicolon, and
incorrect template variable filter.

To test, apply the patch and go to Tools -> Patron lists.

 - Click the "Actions" menu corresponding to a patron list.
 - Select "Print patron cards."
 - In the "Print patron cards" modal, click the "Export" button.
 - The modal should reload with a link to download a patron card PDF.
   The link should work correctly.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit a57aea15a7f86e71bdfb6d6540aed18b2702b226)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit ca04ab8d7fb104961f1e299057ca02ef797aa20f)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../intranet-tmpl/prog/en/modules/patron_lists/lists.tt     | 6 +++---
 .../intranet-tmpl/prog/en/modules/patroncards/print.tt      | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
index 8e18d21ffd..6361ca7bf5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
@@ -47,7 +47,7 @@
                         <td>
                             [% IF l.shared %]
                                 [% IF shared_by_other %]
-                                    by <a href=/cgi-bin/koha/members/moremember.pl?borrowernumber=[% l.owner.id | html %]">[% INCLUDE 'patron-title.inc' patron=l.owner %]</a>
+                                    by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% l.owner.id | uri %]">[% INCLUDE 'patron-title.inc' patron=l.owner %]</a>
                                 [% ELSE %]
                                     by you
                                 [% END %]
@@ -128,7 +128,7 @@
     <script>
         $(document).ready(function() {
             var patronExportModal = $("#patronExportModal");
-            var patronExportModalBody = $("#patronExportModal .modal-body")
+            var patronExportModalBody = $("#patronExportModal .modal-body");
 
             $('#patron-lists-table').dataTable($.extend(true, {}, dataTablesDefaults, {
                 "autoWidth": false,
@@ -160,7 +160,7 @@
                 modal_body.html("<div id=\"loading\"><img src=\"[% interface | html %]/[% theme | html %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>");
                 target_url = $(this).attr("action");
                 params =  $( this ).serialize();
-                modal_body.load( target_url + "?" + params + " #custom-doc");
+                $("#patronExportModal .modal-body").load( target_url + "?" + params + " #export_patron_list");
             });
 
             patronExportModal.on("click",".closebtn,.gb-close",function(e){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
index c27c00489b..9d9e6b031f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
@@ -36,10 +36,12 @@
                 </fieldset>
             </form>
             [% ELSIF ( patronlist_id && template_id && layout_id ) %]
-                <h3>Click on the link to download the patron cards from the patron list.</h3>
+                <div id="export_patron_list">
+                    <h3>Click on the link to download the patron cards from the patron list.</h3>
                     <p>
                         <a class="document pdf" href="/cgi-bin/koha/patroncards/create-pdf.pl?patronlist_id=[% patronlist_id | html %]&amp;template_id=[% template_id | html %]&amp;layout_id=[% layout_id | html %]&amp;layout_back_id=[% layout_back_id | html %]&amp;start_card=[% start_card | html %]">label_patronlist_[% patronlist_id | html %].pdf</a>
                     </p>
+                </div>
             [% ELSE %]
             <h3>
                     [% IF ( label_ids ) %]
-- 
2.39.5