Attachment 38605 Details for Bug 12253 – Bug 12253: Fix MARCUrls in basket

[patch] Bug 12253: Fix MARCUrls in basket

Bug-12253-Fix-MARCUrls-in-basket.patch (text/plain), 4.77 KB, created by Jonathan Druart on 2015-04-28 13:20:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-04-28 13:20:24 UTC

Size: 4.77 KB

patch

obsolete

>From 54ed0abc085f92623fdad276d9f6c0c0ef4b6a36 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
>---
> .../intranet-tmpl/prog/en/modules/basket/basket.tt | 27 ++++++++++++----------
> .../opac-tmpl/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 d9ff504..847088c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>@@ -278,18 +278,21 @@ function batchDelete(){
> </tr>
> [% END %]
> 
>- [% IF ( BIBLIO_RESULT.MARCurlS ) %]
>- <tr>
>- <th scope="row">URL(s)</th>
>- <td>
>-	 [% FOREACH MARCurl IN BIBLIO_RESULT.MARCurlS %]
>-		[% IF ( MARCurl.part ) %][% MARCurl.part %]
>-			 [% END %]
>-
>-		[% MARCurl.MARCurl %]
>-			[% IF ( MARCurl.notes ) %][% FOREACH note IN MARCurl.notes %][% note.note %] [% END %][% END %]
>- [% END %]</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 %][% MARCurl.part %][% END %]
>+
>+ <a href="[% MARCurl.MARCURL %]" title="[% MARCurl.MARCURL %]">[% MARCurl.linktext %]</a>
>+
>+ [% IF MARCurl.notes %][% FOREACH note IN MARCurl.notes %][% note.note %][% 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 4a44b33..2418a5e 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 %]
>- 
>- [% IF ( MARCurl.part ) %][% MARCurl.part %]
>- 
>- [% END %]
>+ [% FOREACH MARCurl IN BIBLIO_RESULT.MARCURLS %]
>+ [% IF MARCurl.part %][% MARCurl.part %][% END %]
> 
>- [% MARCurl.MARCurl %]
>- [% IF ( MARCurl.notes ) %][% FOREACH note IN MARCurl.notes %][% note.note %] [% 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 %]
>- 
>+
>+ [% IF MARCurl.notes %][% FOREACH note IN MARCurl.notes %][% note.note %][% END %][% END %]
>+ [% END %]
> </td>
> </tr>
> [% END %]
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 12253: 38605 | 38634 | 38691