From 772c095ea31a45743dd6bdefeda576e95808f67c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 30 Apr 2014 12:12:07 +0200 Subject: [PATCH] Bug 11578: (follow-up) fix funds grouping The datatables sort options were wrong. The funds for a budget could be ungrouped. To reproduce: - Create 3 budgets A, B, C. - Create 1 or more funds for A, B, C - Mark B and C as inactive. - Create another fund for A - Go on the fund list view, click on "show inactive funds" => The last fund is not grouped without other funds of budget A. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton --- .../intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index b845d2625c..c7931739be 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -180,11 +180,11 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") } }, "aoColumnDefs": [ - { "bVisible": false, "aTargets": [ 0, 1 ] } + { "bVisible": false, "aTargets": [ 0, 1 ] }, + { "bSortable": false, "aTargets": ["_all"] } ], - "aaSortingFixed": [[ 1, 'asc' ]], - "aaSorting": [[ 2, 'asc' ]], - 'bSort': false, + 'bSort': true, + 'aaSortingFixed': [[ 1, 'asc' ]], 'bPaginate': false, "bAutoWidth": false })); @@ -313,7 +313,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") [% END %] [% budget.budget_period_active %] - Budget [% budget.budget_period_description %] + Budget [% budget.budget_period_description %][% UNLESS budget.budget_period_active %] (inactive)[% END %] [% budget.budget_code_indent %] [% budget.budget_name %] -- 2.39.5