From 933223cc6de467be535bc22ecf2d191f7828456e Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Thu, 13 Oct 2011 10:02:38 -0400 Subject: [PATCH] Fix for Bug 7024 - Can't delete other library's messages with AllowAllMessageDeletion on Content-Type: text/plain; charset="utf-8" The display of messages "to the patron" on the checkout screen lacked the same logic controlling messages "to other librarians," affecting conditions under which the [Delete] link would be shown. This match makes the two categories consistent with each other: A delete link will be shown if the logged in branch matches the branch where the message was set OR if AllowAllMessageDeletion is turned on. --- .../prog/en/modules/circ/circulation.tt | 5 ++++- 1 files changed, 4 insertions(+), 1 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 385579c..061f376 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -632,7 +632,10 @@ 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>[% END %]</li> + <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> + [% 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> [% END %] </ul> -- 1.7.3