Attachment 79004 Details for Bug 18480 – Bug 18480: Get rid of unwanted / distracting link in patron search for fund owner

[patch] Bug 18480: Get rid of unwanted / distracting link in patron search for fund owner

Bug-18480-Get-rid-of-unwanted--distracting-link-in.patch (text/plain), 9.68 KB, created by Owen Leonard on 2018-09-16 21:07:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2018-09-16 21:07:17 UTC

Size: 9.68 KB

patch

obsolete

>From 702e4d3d149461dba434d2e0315cc9f1ddc77393 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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        | 42 ++++++++++++++++++++++
> .../en/modules/members/tables/members_results.tt   |  2 +-
> .../modules/patroncards/tables/members_results.tt  |  2 +-
> .../en/modules/serials/tables/members_results.tt   |  2 +-
> 5 files changed, 46 insertions(+), 4 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 77a5188..4dc6bca 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 | html %]",
>                 "dt_name":
>-                    "<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]'>[% 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%]</a></span>",
>+                    "<a href=\"#\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap'>[% 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%]</a>",
>                 "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 44773bb..d12b0d9 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
>@@ -7,6 +7,7 @@
> <title>Koha &rsaquo; Patron search</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("css/datatables.css") | $raw %]
>+<style> .modal-body .close { display: none; } </style>
> </head>
> 
> <body id="common_patron_search" class="common">
>@@ -89,6 +90,31 @@
> 
> <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div>
> 
>+
>+<div class="modal" id="patronPreview" tabindex="-1" role="dialog" aria-labelledby="patronPreviewLabel">
>+    <div class="modal-dialog" role="document">
>+        <div class="modal-content">
>+            <div class="modal-header">
>+                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
>+                <h4 class="modal-title" id="patronPreviewLabel"></h4>
>+            </div>
>+            <div class="modal-body">
>+                <div id="loading">
>+                    <img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" /> Loading
>+                </div>
>+                <div id="patronPreviewContent">
>+                </div>
>+            </div>
>+            <div class="modal-footer">
>+                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
>+            </div>
>+        </div>
>+    </div>
>+</div>
>+
>+</div>
>+</div>
>+
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'datatables.inc' %]
> 
>@@ -200,6 +226,22 @@
>                 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;
>+                $("#patronPreviewContent").load( page + " div.container-fluid", function() {
>+                    $("#loading").hide();
>+                });
>+
>+                $('#patronPreview').modal({ show:true });
>+            });
>+
>+            $("#patronPreview").on('hidden.bs.modal', function (e) {
>+                $("#patronPreviewContent").html("");
>+                $("#loading").show();
>+            });
>+
>         });
> 
>         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 6799c31..db09662 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
>@@ -17,7 +17,7 @@
>                 "dt_cardnumber":
>                     "[% data.cardnumber | html %]",
>                 "dt_name":
>-                    "<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]'>[% 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 %]</a><br />[% INCLUDE escape_address data = data %][% IF data.email %]<br/>Email: <a href='mailto:[% data.email | html %]'>[% data.email | html %]</a>[% END %]</span>",
>+                    "<a href=\"#\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap'>[% 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 %]</a><br />[% INCLUDE escape_address data = data %][% IF data.email %]<br/>Email: <a href='mailto:[% data.email | html %]'>[% data.email | html %]</a>[% 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 3ff9547..f4af675 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 | html %]",
>                 "dt_name":
>-                    "<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]'>[% 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%]</a></span>",
>+                    "<a href=\"#\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap'>[% 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%]</a>",
>                 "dt_category":
>                     "[% data.category_description | html %] ([% data.category_type | html %])",
>                 "dt_branch":
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt
>index 976b178..453f6e9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt
>@@ -9,7 +9,7 @@
>                 "dt_cardnumber":
>                     "[% data.cardnumber | html %]",
>                 "dt_name":
>-                    "<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]'>[% 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%]</a></span>",
>+                    "<a href=\"#\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap'>[% 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 %]</a>",
>                 "dt_branch":
>                     "[% data.branchname | html %]",
>                 "dt_action":
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18480: 62562 | 75461 | 77743 | 78395 | 78925 | 78926 | 79004 | 79899 | 79943 | 80168