From f68883113bbe08bc898369b49980a02e27f168b1 Mon Sep 17 00:00:00 2001 From: Mathieu Saby Date: Sun, 22 Dec 2013 23:34:18 +0100 Subject: [PATCH] Bug 11435 - Show basketgroup information in Acquisition tab in catalogue page Content-Type: text/plain; charset="utf-8" This patch adds a new column for displaying information about basketgroups in the Acquisition tab on catalogue page for a record. It also adds the number of the basket in the basket column. If the user does not have group_manage permission, he just see the basketgroup name and number. If he has the permission, he can click to display the basketgroup. If the basket is not in a basketgroup, the column is empty. To test: Use a record in an order, and put the basket in a basketgroup. Connect with a user WITHOUY group_manage permission (but with order_manage permission). Go to the record's detail in catalogue and click on Acquisition tab. Check you see the name and number of the basketgroup, with no link around it. Check the number of the basket is displayed within () after the name of the basket Click on the basket link, check the basket displayed is the right one. Connect with a user WITH group_manage permission. Go to the record's detail in catalogue and click on Acquisition tab. Check you see a link with the name and number of the basketgroup. Click on the link, check the basketgroup displayed is the right one. On the basketgroup page, move the basket out of the basketgroup, and save the basketgroup. Go back to the record's page on the catalogue and click on Acquisition tab. Check the basketgroup column is empty --- .../prog/en/modules/catalogue/detail.tt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 0a44dbf..5b1ace8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -260,9 +260,9 @@ function verify_images() { 'sDom': 't', 'bPaginate': false, 'bAutoWidth': false, - "aaSorting": [[ 2, "desc" ]], + "aaSorting": [[ 3, "desc" ]], "aoColumnDefs": [ - { "aTargets": [ 2, 3 ], "sType": "title-string" } + { "aTargets": [ 3, 4 ], "sType": "title-string" } ] })); @@ -830,6 +830,7 @@ function verify_images() { + @@ -841,10 +842,19 @@ function verify_images() { [% FOR order IN orders %] + -- 1.7.9.5
Basket group Basket Order number Creation date
+ [% IF (order.basketgroupid) %] + [% IF CAN_user_acquisition_group_manage %] + [% order.groupname %] ([% order.basketgroupid %]) + [% ELSE %] + [% order.groupname %] ([% order.basketgroupid %]) + [% END %] + [% END %] + [% IF CAN_user_acquisition_order_manage %] - [% order.basketname %] + [% order.basketname %] ([% order.basketno %]) [% ELSE %] - [% order.basketname %] + [% order.basketname %] ([% order.basketno %]) [% END %] [% order.ordernumber %] [% order.creationdate | $KohaDates%]