Attachment 105492 Details for Bug 23243 – Bug 23243: Adjust previous patch

[patch] Bug 23243: Adjust previous patch

Bug-23243-Adjust-previous-patch.patch (text/plain), 2.57 KB, created by Martin Renvoize (ashimema) on 2020-06-02 14:27:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-06-02 14:27:44 UTC

Size: 2.57 KB

patch

obsolete

>From ae43b244b8403c1d6fef027006a347ef7ea8ddd9 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 12 Dec 2019 11:07:31 +0100
>Subject: [PATCH] Bug 23243: Adjust previous patch
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../prog/en/modules/serials/checkexpiration.tt             | 7 +++++--
> serials/checkexpiration.pl                                 | 4 ++--
> 2 files changed, 7 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
>index 79ddb06aba..5b56e07cca 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
>@@ -47,8 +47,11 @@
> 
>         <li>
>             <label for="showhistoricexpired">Include historic expirations:</label>
>-            <input id="showhistoricexpired" type="checkbox" name="showhistoricexpired"
>-            [% IF ( showhistoricexpired ) %] checked="checked" [% END %]/>
>+            [% IF showhistoricexpired %]
>+                <input id="showhistoricexpired" type="checkbox" name="showhistoricexpired" checked="checked" />
>+            [% ELSE %]
>+                <input id="showhistoricexpired" type="checkbox" name="showhistoricexpired" />
>+            [% END %]
>         </li>
>         </ol>
> </fieldset>
>diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
>index da865a7ae8..387651871e 100755
>--- a/serials/checkexpiration.pl
>+++ b/serials/checkexpiration.pl
>@@ -70,7 +70,7 @@ my $issn  = $query->param('issn');
> my $branch = $query->param('branch');
> my $date = $query->param('date');
> $date = eval { dt_from_string( scalar $query->param('date') ) } if $date;
>-my $showhistoricexpired = $query->param('showhistoryexpired');
>+my $showhistoricexpired = $query->param('showhistoricexpired');
> 
> if ($date) {
>     my @subscriptions = SearchSubscriptions({ title => $title, issn => $issn, orderby => 'title' });
>@@ -97,7 +97,7 @@ if ($date) {
>         my $expirationdate_dt = dt_from_string( $expirationdate, 'iso' );
>         my $today_dt = dt_from_string();
>         if (   DateTime->compare( $date, $expirationdate_dt ) == 1
>-            && ( $showhistoricexpired || DateTime->compare( $expiration_dt, $today_dt ) == 1 )
>+            && ( $showhistoricexpired || DateTime->compare( $expirationdate_dt, $today_dt ) == 1 )
>             && ( !$branch || ( $subscription->{'branchcode'} eq $branch ) ) ) {
>             push @subscriptions_loop, $subscription;
>         }
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 23243: 91138 | 96215 | 105491 | 105492 | 105493 | 119129 | 119130 | 119131 | 119826 | 119827 | 119828