From 5a7e788a25aeb79c8027f37dff00b1700ea6ddc5 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 15 Apr 2014 16:47:20 +0200 Subject: [PATCH] Bug 9063: When ordering from staged file '# Bibs' is empty Bug 2060 renames columns num_biblios with num_records in the import_batches table. The addorderiso2709 files had not been fixed. Test plan: Add an order from a staged file to a basket and verify the "# Bibs" columns is correctly filled. Before the patch, the column was empty. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Works as described, passes all tests and QA script. --- acqui/addorderiso2709.pl | 8 ++++---- .../intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index ad028b6..91c0a4c 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -334,7 +334,7 @@ sub import_batches_list { if (scalar @$stagedList) { push @list, { import_batch_id => $batch->{'import_batch_id'}, - num_biblios => $batch->{'num_records'}, + num_records => $batch->{'num_records'}, num_items => $batch->{'num_items'}, staged_date => $batch->{'upload_timestamp'}, import_status => $batch->{'import_status'}, @@ -404,12 +404,12 @@ sub import_biblios_list { push @list, \%cellrecord; } - my $num_biblios = $batch->{'num_records'}; + my $num_records = $batch->{'num_records'}; my $overlay_action = GetImportBatchOverlayAction($import_batch_id); my $nomatch_action = GetImportBatchNoMatchAction($import_batch_id); my $item_action = GetImportBatchItemAction($import_batch_id); $template->param(biblio_list => \@list, - num_results => $num_biblios, + num_results => $num_records, import_batch_id => $import_batch_id, "overlay_action_${overlay_action}" => 1, overlay_action => $overlay_action, @@ -428,7 +428,7 @@ sub batch_info { comments => $batch->{'comments'}, import_status => $batch->{'import_status'}, upload_timestamp => $batch->{'upload_timestamp'}, - num_biblios => $batch->{'num_records'}, + num_records => $batch->{'num_records'}, num_items => $batch->{'num_items'}); if ($batch->{'num_records'} > 0) { if ($batch->{'import_status'} eq 'staged' or $batch->{'import_status'} eq 'reverted') { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index 6f51956..0974e92 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -403,7 +403,7 @@ [% END %] [% batch_lis.staged_date | $KohaDates with_hours => 1 %] - [% batch_lis.num_biblios %] + [% batch_lis.num_records %] Add orders [% END %] -- 1.7.10.4