From 45ce981a2895e58e7ef00f4fb9af4dd16e7a0a21 Mon Sep 17 00:00:00 2001 From: Mathieu Saby Date: Sun, 2 Feb 2014 23:07:16 +0100 Subject: [PATCH] Bug 11027: (follow-up) hide link if no basketgroup and use real branch name This patch is a answer to remarks made by QA: - if there is no basketgroup for an order, the basketgroup column in lastorders.pl is now blank (instead of parentheses) - the name of the branch is used instead of its code in the branch column To test: check late orders, included and not included into basketgroup Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton --- .../prog/en/modules/acqui/lateorders.tt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index c5341c29e6..8a3cd83040 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -1,4 +1,5 @@ [% USE KohaDates %] +[% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Late orders @@ -166,13 +167,15 @@ $(document).ready(function() { [% END %] - [% IF ( CAN_user_acquisition_group_manage ) %] - [% lateorder.basketgroupname %] ([% lateorder.basketgroupid %]) - [% ELSE %] - [% lateorder.basketgroupname %] ([% lateorder.basketgroupid %]) + [% IF ( lateorder.basketgroupid ) %] + [% IF ( CAN_user_acquisition_group_manage ) %] + [% lateorder.basketgroupname %] ([% lateorder.basketgroupid %]) + [% ELSE %] + [% lateorder.basketgroupname %] ([% lateorder.basketgroupid %]) + [% END %] [% END %] - [% lateorder.branch %] + [% Branches.GetName( lateorder.branch ) %] [% lateorder.budget %] -- 2.39.5