Skip to content
Browse files

Bug 8943 - Add table sorting to labels - Followup - Sort pulldowns in…

… batch export.

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Nora Blake <nblake@masslibsystem.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
  • Loading branch information...
1 parent 3780bca commit a12629d1f06df6e1901aa1087ecfb5c8455b6b82 @kylemhall kylemhall committed with jcamins
Showing with 6 additions and 4 deletions.
  1. +4 −2 C4/Creators/Lib.pm
  2. +2 −2 labels/label-print.pl
View
6 C4/Creators/Lib.pm
@@ -155,7 +155,8 @@ sub get_all_templates {
my %params = @_;
my @templates = ();
my $query = "SELECT " . ($params{'field_list'} ? $params{'field_list'} : '*') . " FROM creator_templates";
- $query .= ($params{'filter'} ? " WHERE $params{'filter'};" : ';');
+ $query .= ($params{'filter'} ? " WHERE $params{'filter'} " : '');
+ $query .= ($params{'orderby'} ? " ORDER BY $params{'orderby'} " : '');
my $sth = C4::Context->dbh->prepare($query);
$sth->execute();
if ($sth->err) {
@@ -181,7 +182,8 @@ sub get_all_layouts {
my %params = @_;
my @layouts = ();
my $query = "SELECT " . ($params{'field_list'} ? $params{'field_list'} : '*') . " FROM creator_layouts";
- $query .= ($params{'filter'} ? " WHERE $params{'filter'};" : ';');
+ $query .= ($params{'filter'} ? " WHERE $params{'filter'} " : '');
+ $query .= ($params{'orderby'} ? " ORDER BY $params{'orderby'} " : '');
my $sth = C4::Context->dbh->prepare($query);
$sth->execute();
if ($sth->err) {
View
4 labels/label-print.pl
@@ -115,8 +115,8 @@
@batch_ids = map{{batch_id => $_}} @batch_ids;
@label_ids = map{{label_id => $_}} @label_ids;
@item_numbers = map{{item_number => $_}} @item_numbers;
- $templates = get_all_templates(field_list => 'template_id, template_code', filter => 'creator = "Labels"');
- $layouts = get_all_layouts(field_list => 'layout_id, layout_name', filter => 'creator = "Labels"');
+ $templates = get_all_templates(field_list => 'template_id, template_code', filter => 'creator = "Labels"', orderby => 'template_code' );
+ $layouts = get_all_layouts(field_list => 'layout_id, layout_name', filter => 'creator = "Labels"', orderby => 'layout_name' );
$output_formats = get_output_formats();
$template->param(
batch_ids => \@batch_ids,

0 comments on commit a12629d

Please sign in to comment.
Something went wrong with that request. Please try again.