From a5b9d8d18c3069940a1d55fd8f74b28cf63f3612 Mon Sep 17 00:00:00 2001 From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Date: Thu, 7 Jan 2016 09:32:28 +0000 Subject: [PATCH] Bug 13618: Fix for debarredcomment and patron messages At the OPAC and intranet. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> --- koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc index aea0889..ece447e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc @@ -51,7 +51,7 @@ Discharge [% END %] </td> - <td>[% d.comment %]</td> + <td>[% d.comment.raw %]</td> <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td> [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %] <td> 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 4360e3b..be118f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -763,7 +763,7 @@ No patron matched <span class="ex">[% message %]</span> [% END %] [% IF ( debarredcomment ) %] - with the explanation: <br/><i>[% debarredcomment | html_line_break %]</i> + with the explanation: <br/><i>[% debarredcomment.raw | html_line_break %]</i> [% END %] <br/> @@ -838,7 +838,7 @@ No patron matched <span class="ex">[% message %]</span> <span class="circ-hlt"> [% lib_messages_loo.message_date_formatted %] [% lib_messages_loo.branchcode %] - <i>"[% lib_messages_loo.message %]"</i> + <i>"[% lib_messages_loo.message.raw %]"</i> </span> [% IF ( lib_messages_loo.can_delete ) %] <a href="/cgi-bin/koha/circ/del_message.pl?message_id=[% lib_messages_loo.message_id %]&borrowernumber=[% lib_messages_loo.borrowernumber %]">[Delete]</a> @@ -850,7 +850,7 @@ No patron matched <span class="ex">[% message %]</span> </li> [% END %] [% FOREACH bor_messages_loo IN bor_messages_loop %] - <li><span class="">[% bor_messages_loo.message_date_formatted %] [% bor_messages_loo.branchcode %] <i>"[% bor_messages_loo.message %]"</i></span> [% IF ( bor_messages_loo.can_delete ) %]<a href="/cgi-bin/koha/circ/del_message.pl?message_id=[% bor_messages_loo.message_id %]&borrowernumber=[% bor_messages_loo.borrowernumber %]">[Delete]</a> + <li><span class="">[% bor_messages_loo.message_date_formatted %] [% bor_messages_loo.branchcode %] <i>"[% bor_messages_loo.message.raw %]"</i></span> [% IF ( bor_messages_loo.can_delete ) %]<a href="/cgi-bin/koha/circ/del_message.pl?message_id=[% bor_messages_loo.message_id %]&borrowernumber=[% bor_messages_loo.borrowernumber %]">[Delete]</a> [% ELSIF ( all_messages_del ) %] <a href="/cgi-bin/koha/circ/del_message.pl?message_id=[% bor_messages_loo.message_id %]&borrowernumber=[% bor_messages_loo.borrowernumber %]">[Delete]</a> [% END %]</li> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 7c6c7eb..9961958 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -982,7 +982,7 @@ [% FOREACH d IN debarments %] <tr> <td>[% d.type %]</td> - <td>[% d.comment %]</td> + <td>[% d.comment.raw %]</td> <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td> [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %] <td> 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 1a05431..ea1ec28 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -179,7 +179,7 @@ function validate1(date) { [% END %] [% IF ( debarredcomment ) %] - with the explanation: <i>[% debarredcomment | html_line_break %]</i> + with the explanation: <i>[% debarredcomment.raw | html_line_break %]</i> [% END %] <a href="#reldebarments" onclick="$('#debarments-tab-link').click()">View restrictions</a> </li> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index 29f357a..908d8be 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -31,7 +31,7 @@ <ul> [% FOREACH bor_messages_loo IN bor_messages_loop %] <li> - <strong>[% bor_messages_loo.message %]</strong><br> + <strong>[% bor_messages_loo.message.raw %]</strong><br> <i>Written on [% bor_messages_loo.message_date | $KohaDates %] by [% bor_messages_loo.branchname %]</i> </li> [% END %] @@ -89,7 +89,7 @@ <div class="alert"> <ul> [% IF ( userdebarred ) %] - <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INFO.userdebarreddate ) %] until <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %][% IF ( BORROWER_INFO.debarredcomment ) %] with the comment <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment %]"</span>[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please contact the library.</li> + <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INFO.userdebarreddate ) %] until <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %][% IF ( BORROWER_INFO.debarredcomment ) %] with the comment <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment.raw %]"</span>[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please contact the library.</li> [% END %] [% IF ( BORROWER_INFO.gonenoaddress ) %] <li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS OPACPatronDetails %]<a href="/cgi-bin/koha/opac-userupdate.pl">contact information</a>[% ELSE %]contact information[% END %] on file. Please contact the library[% IF OPACPatronDetails %] or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)[% END %].</li> -- 2.1.0