From c44bbe180c2a8d71ea0705d52bcdb21ba4ac6741 Mon Sep 17 00:00:00 2001 From: preprod Date: Tue, 15 Oct 2013 16:59:54 +0200 Subject: [PATCH] Bug 11059 Not possible to sort staged dates in metric format dt_add_type_uk_date function and call to it was missing. So, sorting metric format dates was not possible on staged files table. --- acqui/addorderiso2709.pl | 5 ++--- .../prog/en/modules/acqui/addorderiso2709.tt | 13 +++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index abfb870..3e9cb72 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -333,13 +333,11 @@ sub import_batches_list { # check if there is at least 1 line still staged my $stagedList=GetImportRecordsRange($batch->{'import_batch_id'}, undef, undef, 'staged'); if (scalar @$stagedList) { - my ($staged_date, $staged_hour) = split (/ /, $batch->{'upload_timestamp'}); push @list, { import_batch_id => $batch->{'import_batch_id'}, num_biblios => $batch->{'num_biblios'}, num_items => $batch->{'num_items'}, - staged_date => $staged_date, - staged_hour => $staged_hour, + staged_date => $batch->{'upload_timestamp'}, import_status => $batch->{'import_status'}, file_name => $batch->{'file_name'}, comments => $batch->{'comments'}, @@ -351,6 +349,7 @@ sub import_batches_list { } } $template->param(batch_list => \@list); + $template->param(dateformat => C4::Context->preference('dateformat')); my $num_batches = GetNumberOfNonZ3950ImportBatches(); $template->param(num_results => $num_batches); } 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 98161b2..cc9e144 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -16,13 +16,22 @@ @@ -95,7 +104,7 @@ [% batch_lis.file_name %] [% batch_lis.comments %] [% batch_lis.import_status %] - [% batch_lis.staged_date | $KohaDates %] [% batch_lis.staged_hour %] + [% batch_lis.staged_date | $KohaDates %] [% batch_lis.num_biblios %] Add orders -- 1.7.2.5