From f64aaf063ea39b70c6f128d74d296566a021d217 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Demians?= <f.demians@tamil.fr>
Date: Thu, 1 Sep 2011 10:09:48 +0200
Subject: [PATCH] Bug 6750 Guarantor search broken on translated templates

Fix the JavaScript to avoid implementing complex string substitution into JS
function call. This patch solves the bug and keep the ability to copy
borrower's address, name, etc., containing new line, simple quote, etc.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../prog/en/modules/members/guarantor_search.tt    | 38 ++++++++++++++++++----
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tt
index ce429bc2c2..bf30f9f3c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tt
@@ -6,7 +6,19 @@
     </style>
     <script type="text/javascript">
         <!--
-        function fillguarantor(id, surname, firstname, streetnumber, address, address2, city, state, zipcode, country, branchcode) {
+        function fillguarantor(id) {
+            var $ = window.$;
+            var surname       = $('#' + id + 'surname').text();
+            var firstname     = $('#' + id + 'firstname').text();
+            var streetnumber  = $('#' + id + 'streetnumber').text();
+            var address       = $('#' + id + 'address').text();
+            var address2      = $('#' + id + 'address2').text();
+            var city          = $('#' + id + 'city').text();
+            var state         = $('#' + id + 'state').text();
+            var zipcode       = $('#' + id + 'zipcode').text();
+            var country       = $('#' + id + 'country').text();
+            var branchcode    = $('#' + id + 'branchcode').text();
+
             var $ = window.opener.$;
             var form = $('#entryform').get(0);
 
@@ -71,16 +83,30 @@
             <th>Select?</th>
 		</tr>
 		[% FOREACH resultsloo IN resultsloop %]
+          [% import(resultsloo) %]
 			<tr>
-				<td>[% resultsloo.cardnumber %]</td>
+				<td>[% cardnumber %]</td>
                 <td>
-                    [% resultsloo.surname %], [% resultsloo.firstname %]
+                    [% surname %], [% firstname %]
                 </td> 
-				<td>[% resultsloo.dateofbirth %]</td>
-				<td><p>[% resultsloo.address %] [% resultsloo.address2 %] [% resultsloo.city %] [% resultsloo.state %] [% resultsloo.zipcode %] [% resultsloo.country %]</p></td>
+				<td>[% dateofbirth %]</td>
+				<td><p>[% address %] [% address2 %] [% city %] [% state %] [% zipcode %] [% country %]</p></td>
                 <td>
+                  <span style="display:none;">
+                   <span id="[% borrowernumber %]surname">[% surname %]</span>
+                   <span id="[% borrowernumber %]firstname">[% firstname %]</span>
+                   <span id="[% borrowernumber %]streetnumber">[% streetnumber %]</span>
+                   <span id="[% borrowernumber %]address">[% address %]</span>
+                   <span id="[% borrowernumber %]address2">[% address2 %]</span>
+                   <span id="[% borrowernumber %]city">[% city %]</span>
+                   <span id="[% borrowernumber %]state">[% state %]</span>
+                   <span id="[% borrowernumber %]zipcode">[% zipcode %]</span>
+                   <span id="[% borrowernumber %]country">[% country %]</span>
+                   <span id="[% borrowernumber %]branchcode">[% branchcode %]</span>
+                  </span>
+
                     <form action="">
-                        <input type="button" onclick="fillguarantor('[% resultsloo.borrowernumber %]', '[% resultsloo.surname |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.firstname |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.streetnumber |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.address |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]','[% resultsloo.address2 |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.city |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.state |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]','[% resultsloo.zipcode |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]','[% resultsloo.country |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]','[% resultsloo.branchcode |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]'); return false;" value="Select"/>
+                        <input type="button" onclick="fillguarantor('[% borrowernumber %]'); return false;" value="Select"/>
                     </form>
                 </td>
 			</tr>
-- 
2.11.0