From 70e59cefd7fcd41272418b6d483bc6e6da2c3e69 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 13 Apr 2011 11:25:07 -0400 Subject: [PATCH] Incremental fix for Bug 3514, Returning items through patron details tab Content-Type: text/plain; charset="utf-8" Hiding the "check in" checkbox for items which are on hold. This mitigates the problem of checkins not triggering holds prompts by forcing the librarian to check in these items individually. This fix should be considered temporary until a more comprehensive fix can be developed which incorporates handling for holds. --- .../prog/en/modules/circ/circulation.tt | 16 ++++++++++++++-- .../prog/en/modules/members/moremember.tt | 4 ++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index f383c21..1c5c799 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -718,7 +718,7 @@ No patron matched [% message %] [% END %] [% IF ( todayissue.renew_error_on_reserve ) %] - On Hold + On Hold [% END %] [% IF ( todayissue.renew_error_too_many ) %] Not Renewable @@ -732,9 +732,15 @@ No patron matched [% message %] [% IF ( todayissue.return_failed ) %] Checkin Failed [% ELSE %] + [% IF ( todayissue.renew_error_on_reserve ) %] + On Hold + + + [% ELSE %] + [% END %] [% END %] [% END %] @@ -786,7 +792,7 @@ No patron matched [% message %] [% END %] [% IF ( previssue.renew_error_on_reserve ) %] - On Hold + On Hold [% END %] [% IF ( previssue.renew_error_too_many ) %] Not Renewable @@ -800,9 +806,15 @@ No patron matched [% message %] [% IF ( previssue.return_failed ) %] Checkin Failed [% ELSE %] + [% IF ( previssue.renew_error_on_reserve ) %] + On Hold + + + [% ELSE %] + [% END %] [% END %] [% END %] 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 9fb1736..ef52555 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -493,9 +493,13 @@ function validate1(date) { [% IF ( issueloo.return_failed ) %] Checkin Failed [% ELSE %] + [% IF ( issueloo.norenew_reason_on_reserve ) %] + On Hold + [% ELSE %] + [% END %] [% END %] [% END %] -- 1.7.3