From 729cd95fc5baebdb7f3578e8ffabdfe06a5deb67 Mon Sep 17 00:00:00 2001 From: Fridolyn SOMERS Date: Tue, 28 May 2013 15:43:05 +0200 Subject: [PATCH] Bug 10362: ensure that all messages and alerts are shown upon checkin If an item is returned and has mutiple error or warnings (e.g., it both needs to be transferred and the patron was debarred in the course of the return), because of a bug in the template, not all of the messages would be displayed. This patch changes the template to show both messages and alerts. Test plan : - Perform an checkout that will a checkin : * need a transfert (return in a different branch) * set user debarred (depends on issuing rules) - Perform check-in => You get tranfert message and debarment alert Signed-off-by: Srdjan Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 5192fd81adaccf9b0f4a01dcc0ffc689edc9468f) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 8525d49e0601c85807235c007f712666c2abbceb) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 8525d49e0601c85807235c007f712666c2abbceb) --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 7142cdc302..6df23b9e80 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -311,7 +311,7 @@ $(document).ready(function () { [% END %] -[% ELSE %] +[% END %] [% IF ( errmsgloop ) %]
@@ -347,7 +347,6 @@ $(document).ready(function () { [% END %] [% END %]
-[% END %]