From 5f8f9c7fe9889e4ddf2689ef7ced50846495f79c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 13 Aug 2018 13:55:31 +0000 Subject: [PATCH] Bug 18480: Get rid of unwanted / distracting link in patron search for fund owner This patch modifies templates where a pop-up window is used to display patron search results. A link has been added to the patron name which triggers a modal window displaying more details about that patron. With each page in the test plan, check that clicking linked names in search results triggers a modal with the correct data. - Acquisitions -> Vendor -> View basket -> Add user - Acquisitions -> Vendor -> Add to basket -> From a new (empty) record -> Add user - Acquisitions -> Funds -> Edit fund -> Select owner - Tools -> Patron card creator -> Manage -> Card batches -> Edit -> Add patrons - Serials -> Subscription -> Edit routing list -> Add recipients --- .../en/modules/acqui/tables/members_results.tt | 2 +- .../prog/en/modules/common/patron_search.tt | 32 ++++++++++++++++++++++ .../en/modules/members/tables/members_results.tt | 2 +- .../modules/patroncards/tables/members_results.tt | 2 +- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt index 1ff3156..869630f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt @@ -9,7 +9,7 @@ "dt_cardnumber": "[% data.cardnumber %]", "dt_name": - "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) cardnumber = data.cardnumber invert_name = 1%]", + "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) cardnumber = data.cardnumber invert_name = 1%]", "dt_branch": "[% data.branchname |html %]", "dt_category": diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt index a1b4ad8..34fc4d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt @@ -6,6 +6,7 @@ Koha › Patron search [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/datatables.css") %] + @@ -88,6 +89,29 @@
Close
+ + + + + + [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] @@ -199,6 +223,14 @@ select_user( borrowernumber, JSON.parse(borrower_data) ); }); + $("body").on("click",".patron_preview", function( e ){ + e.preventDefault(); + var borrowernumber = $(this).data("borrowernumber"); + var page = "/cgi-bin/koha/members/moremember.pl?print=brief&borrowernumber=" + borrowernumber; + $("#patronPreview .modal-body").load( page + " div.container-fluid" ); + $('#patronPreview').modal({show:true}); + }); + }); function filter() { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt index 666b59c..6000818 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt @@ -16,7 +16,7 @@ "dt_cardnumber": "[% data.cardnumber | html %]", "dt_name": - "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) invert_name = 1 %]
[% INCLUDE escape_address data = data %][% IF data.email %]
Email: [% data.email | html %][% END %]", + "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) invert_name = 1 %]
[% INCLUDE escape_address data = data %][% IF data.email %]
Email: [% data.email | html %][% END %]", "dt_dateofbirth": "[% data.dateofbirth | $KohaDates %]", "dt_category": diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt index 61c34d0..ca61069 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt @@ -9,7 +9,7 @@ "dt_cardnumber": "[% data.cardnumber %]", "dt_name": - "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) cardnumber = data.cardnumber invert_name = 1%]", + "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) cardnumber = data.cardnumber invert_name = 1%]", "dt_category": "[% data.category_description |html %] ([% data.category_type |html %])", "dt_branch": -- 2.1.4