Bug 23243: Adjust previous patch

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

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 0ec36ce..ef656fc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
@@ -61,8 +61,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 2b6f202..aeebd2f 100755 (executable)
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -69,7 +69,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' });
@@ -96,7 +96,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;
         }