From 3780bca7798eb3eb1808e4dca0d0c66e57db4c52 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 18 Oct 2012 10:04:44 -0400 Subject: [PATCH 1/2] Bug 8943 - Add table sorting to labels Signed-off-by: Melia Meggs Signed-off by: Nora Blake Signed-off-by: Katrin Fischer Signed-off-by: Jared Camins-Esakov --- .../prog/en/modules/labels/label-manage.tt | 56 ++++++++++++------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt index db76c125cf..d685640ded 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt @@ -78,6 +78,20 @@ }; //]]> + + + +[% INCLUDE 'datatables-strings.inc' %] + + + [% INCLUDE 'header.inc' %] @@ -99,27 +113,29 @@ [% IF ( table_loop ) %]

Currently Available [% label_element_title %]

- +
[% FOREACH table_loo IN table_loop %] - [% IF ( table_loo.header_fields ) %] - - [% FOREACH header_field IN table_loo.header_fields %] - - [% END %] - - [% ELSE %] - - [% FOREACH text_field IN table_loo.text_fields %] - [% IF ( text_field.select_field ) %] - - [% ELSIF ( text_field.field_value ) %] - - [% ELSE %] - - [% END %] - [% END %] - - [% END %] + [% IF ( table_loo.header_fields ) %] + + + [% FOREACH header_field IN table_loo.header_fields %] + + [% END %] + + + [% ELSE %] + + [% FOREACH text_field IN table_loo.text_fields %] + [% IF ( text_field.select_field ) %] + + [% ELSIF ( text_field.field_value ) %] + + [% ELSE %] + + [% END %] + [% END %] + + [% END %] [% END %]
[% header_field.field_label %]
[% text_field.field_value %] 
[% header_field.field_label %]
[% text_field.field_value %] 
From a12629d1f06df6e1901aa1087ecfb5c8455b6b82 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 1 Nov 2012 12:47:13 -0400 Subject: [PATCH 2/2] Bug 8943 - Add table sorting to labels - Followup - Sort pulldowns in batch export. Signed-off-by: Melia Meggs Signed-off-by: Nora Blake Signed-off-by: Katrin Fischer All tests and QA script pass. Signed-off-by: Jared Camins-Esakov --- 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 0a57b598f1..d052427a38 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 b65c7a6c55..dd895fbbbc 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,