From cfff527b30fd1449b38af3d8724688e8b9024642 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 8 Dec 2011 10:22:07 -0500 Subject: [PATCH] Bug 7337 - "Debarred Until" display in the opac tells patrons they are debarred until the year 9999 Content-Type: text/plain; charset="utf-8" This patch copies the debarred handling method from circulation.pl for use on opac-user.pl so that debarred dates and comments can be handled properly. I have slightly reworded the message in the OPAC and on circulation.pl to make the display of the debarred comment a little clearer. --- .../prog/en/modules/circ/circulation.tt | 4 ++-- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 4 ++-- opac/opac-user.pl | 12 ++++++++++-- 3 files changed, 14 insertions(+), 6 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 5627109..e3200ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -565,12 +565,12 @@ No patron matched [% message %] [% IF ( userdebarred ) %]
  • - Restricted: Patron's account is restricted [% IF (userdebarreddate ) %] until [% userdebarreddate %] [% END %] [% IF (debarredcomment ) %]([% debarredcomment %])[% END %] + Restricted: Patron's account is restricted [% IF (userdebarreddate ) %] until [% userdebarreddate %] [% END %] [% IF (debarredcomment ) %] with the comment "[% debarredcomment %]"[% END %]
    - +
  • [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt index 0971f46..b16936c 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt @@ -92,8 +92,8 @@ $.tablesorter.addParser({ [% IF ( BORROWER_INF.flagged ) %]