Bugzilla – Attachment 17080 Details for
Bug 8943
Add table sorting to labels
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 8943 - Add table sorting to labels - Followup - Sort pulldowns in batch export.
PASSED-QA-Bug-8943---Add-table-sorting-to-labels--.patch (text/plain), 2.68 KB, created by
Katrin Fischer
on 2013-03-31 08:42:43 UTC
(
hide
)
Description:
[PASSED QA] Bug 8943 - Add table sorting to labels - Followup - Sort pulldowns in batch export.
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-03-31 08:42:43 UTC
Size:
2.68 KB
patch
obsolete
>From 0f56276112f0ffc4585b8265d6a1db6ebfaa2db0 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Thu, 1 Nov 2012 12:47:13 -0400 >Subject: [PATCH] [PASSED QA] 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. >--- > C4/Creators/Lib.pm | 6 ++++-- > labels/label-print.pl | 4 ++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > >diff --git a/C4/Creators/Lib.pm b/C4/Creators/Lib.pm >index 0a57b59..d052427 100644 >--- a/C4/Creators/Lib.pm >+++ b/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) { >diff --git a/labels/label-print.pl b/labels/label-print.pl >index b65c7a6..dd895fb 100755 >--- a/labels/label-print.pl >+++ b/labels/label-print.pl >@@ -115,8 +115,8 @@ elsif ($op eq 'none') { > @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, >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8943
:
12912
|
13148
|
13180
|
13299
|
15992
|
15993
|
15994
|
17079
| 17080