From 41928b088075a5da9bffb19edf906e94aa84466f Mon Sep 17 00:00:00 2001 From: Owen Leonard 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 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. Signed-off-by: Nicole C. Engard Signed-off-by: Ian Walls Signed-off-by: Chris Cormack --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 385579c35e..061f376160 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 [% message %] [% END %] [% FOREACH bor_messages_loo IN bor_messages_loop %] -
  • [% bor_messages_loo.message_date_formatted %] [% bor_messages_loo.branchcode %] "[% bor_messages_loo.message %]" [% IF ( bor_messages_loo.can_delete ) %][Delete][% END %]
  • +
  • [% bor_messages_loo.message_date_formatted %] [% bor_messages_loo.branchcode %] "[% bor_messages_loo.message %]" [% IF ( bor_messages_loo.can_delete ) %][Delete] + [% ELSIF ( all_messages_del ) %] + [Delete] + [% END %]
  • [% END %] -- 2.39.5