gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jonathan Druart 2019-12-12 11:07:31 +01:00
parent eeca29afed
commit 9ddba2b737
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
View File

@ -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>

4
serials/checkexpiration.pl
View File

@ -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;
}