Attachment 137623 Details for Bug 31141 – Bug 31141: Template simplification

[patch] Bug 31141: Template simplification

Bug-31141-Template-simplification.patch (text/plain), 3.34 KB, created by David Nind on 2022-07-12 12:13:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2022-07-12 12:13:52 UTC

Size: 3.34 KB

patch

obsolete

>From fa291fa8dda216572ec46056e9f8d45ab355bd9e Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Tue, 12 Jul 2022 11:22:36 +0100
>Subject: [PATCH] Bug 31141: Template simplification
>
>In the only place we use the waiting_holds include, we were hard coded
>to always pass the 'select_column' variable as true.
>
>We can simply and clarify the logic by just removing this superflous
>variable.
>
>Test plan
>1. Confirm that the waiting holds tables continue to display as expected
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc    | 4 ----
> .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt     | 4 ++--
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
>index 4738e44b5e..687dd75379 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
>@@ -3,9 +3,7 @@
> <table class="holds_table" id="[% table_name | html %]">
>     <thead>
>         <tr>
>-            [% IF select_column %]
>             <th class="NoSort"><input type="checkbox" class="select_hold_all"/></th>
>-            [% END %]
>             <th>Waiting since</th>
>             <th>Date hold placed</th>
>             <th>Expiration date</th>
>@@ -23,9 +21,7 @@
>     <tbody>
>         [% FOREACH reserveloo IN reserveloop %]
>             <tr>
>-                [% IF select_column %]
>                 <th><input type="checkbox" class="select_hold" data-id="[% reserveloo.reserve_id | html %]"/></th>
>-                [% END %]
>                 <td><span data-order="[% reserveloo.waitingdate | html %]">[% reserveloo.waitingdate | $KohaDates %]</span></td>
>                 <td><span data-order="[% reserveloo.reservedate | html %]">[% reserveloo.reservedate | $KohaDates %]</span></td>
>                 <td><span data-order="[% reserveloo.expirationdate | html %]">[% reserveloo.expirationdate | $KohaDates %]</span></td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>index b6e06f7bc9..bccefdb7f1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>@@ -95,7 +95,7 @@
>             <div id="toolbar" class="btn-toolbar">
>                 <button class="cancel_selected_holds" data-bulk="true"></button>
>             </div>
>-            [% INCLUDE waiting_holds.inc select_column='1' table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %]
>+            [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %]
>         [% ELSE %]
>             <div class="dialog message">No holds found.</div>
>         [% END %]
>@@ -120,7 +120,7 @@
>                    [% END %]
> 
>                 </span>
>-               [% INCLUDE waiting_holds.inc select_column='1' table_name='holdso' reserveloop=overloop tab='holdsover' %]
>+               [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %]
>             [% ELSE %]
>                 <div class="dialog message">No holds found.</div>
>             [% END %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 31141: 137617 | 137621 | 137623 | 137624