From 75423b301062c8b334a879eaa6b5f6abbeb03d02 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 25 Sep 2009 13:54:11 -0500 Subject: [PATCH] Corrections to ensure message list appears in the proper box (Bug 3668). The patch sets a "flagged" variable for displaying the messages correctly, bringing it in line with the way other messages are displayed. The patch also includes some markup tweaks and a change to make display of the "add message" link javascript-dependent. Signed-off-by: Galen Charlton --- circ/circulation.pl | 11 ++- .../prog/en/modules/circ/circulation.tmpl | 71 +++++++++---------- 2 files changed, 44 insertions(+), 38 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index ca4b995a01..398fdd2309 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -653,10 +653,17 @@ if ( C4::Context->preference("memberofinstitution") ) { ); } +my $lib_messages_loop = GetMessages( $borrowernumber, 'L', $branch ); +if($lib_messages_loop){ $template->param(flagged => 1 ); } + +my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch ); +if($bor_messages_loop){ $template->param(flagged => 1 ); } + + $template->param( issued_itemtypes_count_loop => \@issued_itemtypes_count_loop, - lib_messages_loop => GetMessages( $borrowernumber, 'L', $branch ), - bor_messages_loop => GetMessages( $borrowernumber, 'B', $branch ), + lib_messages_loop => $lib_messages_loop, + bor_messages_loop => $bor_messages_loop, all_messages_del => C4::Context->preference('AllowAllMessageDeletion'), findborrower => $findborrower, borrower => $borrower, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl index 8b8b9900a1..4ab1126513 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -7,7 +7,7 @@ - - - @@ -171,34 +166,36 @@ function showhide(id){ - -- 2.39.5

Messages: