Attachment 66757 Details for Bug 12691 – Bug 12691: [FOLLOW-UP] Follow-up patch

[patch] Bug 12691: [FOLLOW-UP] Follow-up patch

Bug-12691-FOLLOW-UP-Follow-up-patch.patch (text/plain), 1.75 KB, created by Nick Clemens (kidclamp) on 2017-09-01 15:43:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2017-09-01 15:43:38 UTC

Size: 1.75 KB

patch

obsolete

>From 5bf46ce4fe90ccc7bf8e6e879a45cff420368b06 Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Fri, 2 Jun 2017 03:37:21 +0000
>Subject: [PATCH] Bug 12691: [FOLLOW-UP] Follow-up patch
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This patch fixes merge conflicts and fixes the problems in Comment 7
>
>QA tools complain about missing bracket, will be fixed in next followup
>Signed-off-by: Marc VÃ©ron <veron@veron.ch>
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>index b9dc769..a54f4c5 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>@@ -202,9 +202,11 @@
>                                 </div>
>                             </div> 
>                 </div> 
>-                [% IF ( display_patron_image ) %]
>+                [% IF ( Koha.Preference('ShowPatronImageInWebBasedSelfCheck') %]
>                     <div class="span2">
>-                        <img src="/cgi-bin/koha/sco/sco-patron-image.pl?borrowernumber=[% borrowernumber %]&csrf_token=[% csrf_token %]" alt="" />
>+                        [% IF ( display_patron_image ) %]
>+                            <img src="/cgi-bin/koha/sco/sco-patron-image.pl?borrowernumber=[% borrowernumber %]&csrf_token=[% csrf_token %]" alt="" />
>+                        [% END %]
>                     </div>
>                 [% END %]
>             </div> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 12691: 59593 | 59961 | 62993 | 63903 | 65527 | 65528 | 65529 | 66252 | 66263 | 66264 | 66265 | 66756 | 66757 | 66758 | 66906 | 66926 | 66953