Attachment 110956 Details for Bug 12556 – Bug 12556: Remove unused HTML

[patch] Bug 12556: Remove unused HTML

Bug-12556-Remove-unused-HTML.patch (text/plain), 2.83 KB, created by Timothy Alexis Vass on 2020-09-30 08:11:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Alexis Vass

Created: 2020-09-30 08:11:13 UTC

Size: 2.83 KB

patch

obsolete

>From c2dec2e114110ff5e68c515a7d98b30a120928e5 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylmala@helsinki.fi>
>Date: Wed, 22 Jul 2020 15:44:31 +0000
>Subject: [PATCH] Bug 12556: Remove unused HTML
>
>Koha::Hold::is_at_destination() already checks for found = 'W' so the ELSE
>code path which would print "Item waiting to be pulled from [...]"
>never gets executed.
>
>Signed-off-by: John Doe <you@example.com>
>---
> .../opac-tmpl/bootstrap/en/includes/holds-table.inc      | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
>index 970df4cccf..0c365b5fb2 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
>@@ -104,18 +104,14 @@
>                             [% IF ( HOLD.is_waiting ) %]
>                                 <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
>                                 [% IF ( HOLD.is_at_destination ) %]
>-                                    [% IF ( HOLD.found ) %]
>-                                        Item waiting at <strong> [% HOLD.branch.branchname | html %]</strong>
>-                                        [% IF ( HOLD.waitingdate ) %]
>-                                            since [% HOLD.waitingdate | $KohaDates %]
>-                                            [% IF HOLD.expirationdate %]
>-                                                until [% HOLD.expirationdate | $KohaDates %]
>-                                            [% END %]
>+                                    Item waiting at <strong> [% HOLD.branch.branchname | html %]</strong>
>+                                    [% IF ( HOLD.waitingdate ) %]
>+                                        since [% HOLD.waitingdate | $KohaDates %]
>+                                        [% IF HOLD.expirationdate %]
>+                                            until [% HOLD.expirationdate | $KohaDates %]
>                                         [% END %]
>-                                        <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
>-                                    [% ELSE %]
>-                                        Item waiting to be pulled from <strong> [% Branches.GetName( HOLD.branchcode ) | html %]</strong>
>                                     [% END %]
>+                                    <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
>                                 [% ELSE %]
>                                     Item in transit to <strong> [% Branches.GetName( HOLD.branchcode ) | html %]</strong> <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
>                                 [% END %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 12556: 107181 | 107182 | 107183 | 107184 | 107185 | 107186 | 108711 | 109140 | 109924 | 109925 | 109926 | 109927 | 109928 | 109929 | 110719 | 110942 | 110943 | 110944 | 110945 | 110946 | 110947 | 110948 | 110949 | 110950 | 110951 | 110952 | 110953 | 110954 | 110955 | 110956 | 110961 | 110962 | 110963 | 110964 | 110965 | 110966 | 111405 | 111406 | 111407 | 111408 | 111409 | 111410 | 111494 | 111495 | 111496 | 111497 | 111498 | 111499 | 111500 | 111509 | 111516 | 111585 | 111610