Attachment 51293 Details for Bug 16450 – Bug 16450 - Remove the use of "onclick" from guarantor search template

[patch] Bug 16450 - Remove the use of "onclick" from guarantor search template

Bug-16450---Remove-the-use-of-onclick-from-guarant.patch (text/plain), 3.86 KB, created by Jonathan Druart on 2016-05-06 14:20:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-05-06 14:20:35 UTC

Size: 3.86 KB

patch

obsolete

>From 7832ea363b370f54957eb0efdcb3c09b8e6b8e88 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 4 May 2016 09:34:46 -0400
>Subject: [PATCH] Bug 16450 - Remove the use of "onclick" from guarantor search
> template
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This patch updates the guarantor search template so that event
>definition is done in the script rather than in an onclick attribute.
>
>This patch also increases the size of the popup window to help prevent
>the need for horizontal scrolling and adds Bootstrap style to the
>"select" button.
>
>To test, apply the patch and clear your browser cache if necessary.
>
>- Go to Patrons and add a patron with a "child" category type.
>- In the "Guarantor information" section, click the "Set to patron"
>  button.
>- In the pop-up window, search for a patron.
>- Click the "Select" button next to a patron.
>- The window should close, and the patron you selected should now appear
>  as the guarantor. The guarantor's address information should be added
>  to the "Main address" section.
>
>Tested on top of Bug 13041 and Bug 16386, works as expected, however see
>Bug 16458
>Signed-off-by: Marc VÃ©ron <veron@veron.ch>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt   | 8 ++++++++
> .../prog/en/modules/members/tables/guarantor_search.tt            | 2 +-
> koha-tmpl/intranet-tmpl/prog/js/members.js                        | 2 +-
> 3 files changed, 10 insertions(+), 2 deletions(-)
>
>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 99bb52f..1dd4151 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
>@@ -107,6 +107,14 @@ $(document).ready(function(){
>         var surname = $(this).data("surname");
>         add_user( borrowernumber, firstname + " " + surname );
>     });
>+
>+    $("body").on("click",".select_user",function(e){
>+        e.preventDefault();
>+        var borrowernumber = $(this).data("borrowernumber");
>+        var guarantor_data = $("#guarantor_data"+borrowernumber).val();
>+        select_user( borrowernumber, JSON.parse(guarantor_data) );
>+    });
>+
> });
> 
> function filter() {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt
>index 33cb95f..fee361b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt
>@@ -17,7 +17,7 @@
>                 "dt_address":
>                     "[% INCLUDE escape_address data=data %]",
>                 "dt_action":
>-                    "<a style='cursor:pointer' onclick='select_user(\"[% data.borrowernumber %]\", [% To.json(data) | html %] );'>Select</a>"
>+                    "<a href=\"#\" class=\"btn btn-mini select_user\" data-borrowernumber=\"[% data.borrowernumber %]\">Select</a><input type=\"hidden\" id=\"guarantor_data[% data.borrowernumber %]\" name=\"guarantor_data\" value=\"[% To.json(data) | html %]\" />"
>             }[% UNLESS loop.last %],[% END %]
>         [% END %]
>     ]
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/members.js b/koha-tmpl/intranet-tmpl/prog/js/members.js
>index a6b6b59..969f39f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/members.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/members.js
>@@ -143,7 +143,7 @@ function Dopop(link) {
> }
> 
> function Dopopguarantor(link) {
>-    var newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=yes,top');
>+    var newin=window.open(link,'popup','width=800,height=500,resizable=no,toolbar=false,scrollbars=yes,top');
> }
> 
> function clear_entry(node) {
>-- 
>2.7.0

Actions: View | Diff | Splinter Review

Attachments on bug 16450: 51241 | 51252 | 51293 | 54538