From 1ef8a97a0d1f630e91ef1d30c8b8ea63d3905f0b Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 16 Jul 2013 08:32:55 -0400 Subject: [PATCH] Bug 10558 [QA Follow-up] --- C4/ImportBatch.pm | 6 +- .../prog/en/modules/tools/manage-marc-import.tt | 150 ++++++++++++-------- tools/batch_records_ajax.pl | 19 ++- tools/manage-marc-import.pl | 53 +------- 4 files changed, 111 insertions(+), 117 deletions(-) diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm index f320c7a..6ddab77 100644 --- a/C4/ImportBatch.pm +++ b/C4/ImportBatch.pm @@ -1032,8 +1032,10 @@ sub GetImportRecordsRange { my $dbh = C4::Context->dbh; - my $order_by = - $dbh->quote_identifier( $parameters->{order_by} || 'import_record_id' ); + my $order_by = $parameters->{order_by} || 'import_record_id'; + ( $order_by ) = grep( /^$order_by$/, qw( import_record_id title status overlay_status ) ) ? $order_by : 'import_record_id'; + $order_by .= ",authorized_heading" if $order_by eq 'title'; + my $order_by_direction = uc( $parameters->{order_by_direction} ) eq 'DESC' ? 'DESC' : 'ASC'; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt index 1a26803..40f916d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt @@ -7,10 +7,8 @@ [% INCLUDE 'doc-head-close.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] -