From b8ad6a6532c236e473d548ad910d920ef1516ecf Mon Sep 17 00:00:00 2001
From: Baptiste Wojtkowski <baptiste.wojtkowski@biblibre.com>
Date: Tue, 23 May 2017 08:54:00 +0000
Subject: [PATCH] Bug 18655: Correct the choose link in unimarc_field_210c
 value builder

- Link 'choose' is now a button.
- It doesn't call directly javascript anymore (use of listener).
- field to load stored in html on the page (less escaping needed).

Test plan :
1) Use UNIMARC catalog
2) Define unimarc_field_210c value builder on 210$c
3) Define an autority type EDITORS with heading on 200$b
4) Create an autority of this type with a single quote in heading, ie : l'avenir
5) Index this new autority
6) Edit a biblio record and launch 210$c value builder
7) Search for new autority
8) Click on 'Choose'
=> Heading should be pasted in 210$c

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 9965aa43e15aaa63fd8999daa98618d20698e89b)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../value_builder/unimarc_field_210c.tt           | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
index 31797ada8e..ce793c9e69 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
@@ -65,9 +65,10 @@
                         <td>[% PROCESS authresult summary=resul.summary %]</td>
                         <td>[% resul.used %] times</td>
                         <td>
-                [% IF ( resul.to_report ) %]
-                            <a href="javascript:report('[% resul.to_report |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]')"><img alt="choose" src="[% interface %]/[% theme %]/images/arrow.gif" width="32" /></a>
-                [% END %]
+                        [% IF ( resul.to_report ) %]
+                            <button class="choosebt">Choose</button>
+                            <p class="toreport" style="display:none">[% resul.to_report | replace('\n', '\\n') | replace('\r', '\\r') | html %]</p>
+                        [% END %]
                         </td>
                     </tr>
                 [% END %]
@@ -82,6 +83,12 @@
 
 [% MACRO jsinclude BLOCK %]
     <script type="text/javascript">
+        $(document).ready(function(){
+            $(".choosebt").on("click",function(){
+                var toreport = $(this).siblings(".toreport").text();
+                report(toreport);
+            });
+        });
         function report(summary){
             var doc   = opener.document;
             var field = doc.getElementById('[% index %]');
@@ -92,4 +99,4 @@
     </script>
 [% END %]
 
-[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
\ No newline at end of file
+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
-- 
2.39.5