Attachment 84147 Details for Bug 22134 – Bug 22134: (follow-up) Simplify check for expired patron

[patch] Bug 22134: (follow-up) Simplify check for expired patron

Bug-22134-follow-up-Simplify-check-for-expired-pat.patch (text/plain), 2.75 KB, created by Owen Leonard on 2019-01-17 16:31:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2019-01-17 16:31:57 UTC

Size: 2.75 KB

patch

obsolete

>From 3300a61fa004605322747b4cdde144eafd4d4ccb Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 17 Jan 2019 16:27:43 +0000
>Subject: [PATCH] Bug 22134: (follow-up) Simplify check for expired patron
>
>This patch move the check for "is_expired" to the template and removes
>unnecessary code from the script. The interface should show no
>difference.
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 4 ++--
> members/moremember.pl | 9 ---------
> 2 files changed, 2 insertions(+), 11 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index 677bf45..9a8c47a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -133,7 +133,7 @@
> [% IF ( lost ) %]
> <li class="blocker">Patron's card has been reported lost.</li>
> [% END %]
>- [% IF ( expired ) %]
>+ [% IF ( patron.is_expired ) %]
> <li class="blocker">
> Expiration:
> [% IF ( patron.dateexpiry ) %]
>@@ -439,7 +439,7 @@
> Expiration date: 
> [% IF ( was_renewed ) %]
> [% patron.dateexpiry | $KohaDates %]
>- [% ELSIF ( expired ) %]
>+ [% ELSIF ( patron.is_expired ) %]
> 
> [% patron.dateexpiry | $KohaDates %]
> Expired
>diff --git a/members/moremember.pl b/members/moremember.pl
>index e76dcd0..637ea9f 100755
>--- a/members/moremember.pl
>+++ b/members/moremember.pl
>@@ -311,15 +311,6 @@ my $translated_language = C4::Languages::language_get_description( $subtag, $sub
> # if the expiry date is before today ie they have expired
> if ( $patron->is_expired ) {
> $template->param(
>- expired => "1",
>- flagged => 1
>- );
>-}
>-# check for NotifyBorrowerDeparture
>-elsif ( $patron->is_going_to_expire ) {
>- # borrower card soon to expire warn librarian
>- $template->param(
>- "warndeparture" => $patron->dateexpiry,
> flagged => 1
> );
> }
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 22134: 83972 | 83998 | 84147 | 84162 | 84191 | 84214 | 84215 | 84238 | 84240 | 84241