From 21c27fbf8d19cc0d71ac1f903af7681b7667ddd7 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Tue, 28 Apr 2015 15:14:49 +0200
Subject: [PATCH] Bug 12253: Fix MARCUrls in basket

At the OPAC and the intranet, the urls don't be displayed anymore.
The variables used in the templates are not the good ones (MARCurlS vs
MARCURLS).

Test plan:
1/ On the intranet side, add some urls to some records
2/ Add these records to the basket
3/ Add records without urls defined
4/ Go on the basket view, click "more details"
5/ You should see the urls displayed
6/ Repeat steps 4-5 at the OPAC

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

NOTE: 856$u displays now in intranet and OPAC. :)

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 6a923f9cc666d3186d70299d0e18530c2bc26e97)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
---
 .../prog/en/modules/basket/basket.tt          | 27 ++++++++++---------
 .../bootstrap/en/modules/opac-basket.tt       | 19 ++++++-------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
index 278a191e5c..b93bae8908 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
@@ -268,18 +268,21 @@ function batchDelete(){
         </tr>
         [% END %]
 
-        [% IF ( BIBLIO_RESULT.MARCurlS ) %]
-        <tr>
-            <th scope="row">URL(s)</th>
-            <td>
-	   [% FOREACH MARCurl IN BIBLIO_RESULT.MARCurlS %]
-		<p>[% IF ( MARCurl.part ) %][% MARCurl.part %]
-			<br />[% END %]
-
-		[% MARCurl.MARCurl %]
-			[% IF ( MARCurl.notes ) %][% FOREACH note IN MARCurl.notes %][% note.note %]<br />[% END %][% END %]
-            [% END %]</p></td>
-        </tr>[% END %]
+
+        [% IF BIBLIO_RESULT.MARCURLS.size %]
+            <tr>
+                <th scope="row">URL(s)</th>
+                <td>
+                   [% FOREACH MARCurl IN BIBLIO_RESULT.MARCURLS %]
+                        [% IF MARCurl.part %]<p>[% MARCurl.part %]</p>[% END %]
+
+                        <a href="[% MARCurl.MARCURL %]" title="[% MARCurl.MARCURL %]">[% MARCurl.linktext %]</a>
+
+                        [% IF MARCurl.notes %][% FOREACH note IN MARCurl.notes %]<p>[% note.note %]</p>[% END %][% END %]
+                    [% END %]
+                </td>
+            </tr>
+        [% END %]
 
         <tr>
             <th scope="row">Location(s)</th>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
index 4a44b33947..2418a5ec82 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
@@ -191,20 +191,21 @@
                                             </tr>
                                         [% END %]
 
-                                        [% IF ( BIBLIO_RESULT.MARCurlS ) %]
+                                        [% IF BIBLIO_RESULT.MARCURLS.size %]
                                             <tr>
                                                 <th scope="row">URL(s)</th>
                                                 <td>
-                                                   [% FOREACH MARCurl IN BIBLIO_RESULT.MARCurlS %]
-                                                        <p>
-                                                        [% IF ( MARCurl.part ) %][% MARCurl.part %]
-                                                            <br />
-                                                        [% END %]
+                                                   [% FOREACH MARCurl IN BIBLIO_RESULT.MARCURLS %]
+                                                        [% IF MARCurl.part %]<p>[% MARCurl.part %]</p>[% END %]
 
-                                                        [% MARCurl.MARCurl %]
-                                                            [% IF ( MARCurl.notes ) %][% FOREACH note IN MARCurl.notes %][% note.note %]<br />[% END %][% END %]
+                                                        [% IF OPACurlOpenInNewWindow %]
+                                                            <a href="[% MARCurl.MARCURL %]" title="[% MARCurl.MARCURL %]" target="_blank">[% MARCurl.linktext %]</a>
+                                                        [% ELSE %]
+                                                            <a href="[% MARCurl.MARCURL %]" title="[% MARCurl.MARCURL %]">[% MARCurl.linktext %]</a>
                                                         [% END %]
-                                                        </p>
+
+                                                        [% IF MARCurl.notes %][% FOREACH note IN MARCurl.notes %]<p>[% note.note %]</p>[% END %][% END %]
+                                                    [% END %]
                                                 </td>
                                             </tr>
                                         [% END %]
-- 
2.39.5