Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_8943' into 3.12-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2013-03-31 08:33:44 -04:00
commit c7cb7f6b5d
3 changed files with 42 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
C4/Creators/Lib.pm
View file

@ -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) {

56
koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
View file

@ -78,6 +78,20 @@
};
//]]>
</script>
<link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/css/datatables.css" />
<script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
[% INCLUDE 'datatables-strings.inc' %]
<script type="text/javascript" src="/intranet-tmpl/prog/en/js/datatables.js"></script>
<script type="text/javascript" id="js">
$(document).ready(function() {
$("#labels-table").dataTable($.extend(true, {}, dataTablesDefaults, {
"sPaginationType": "four_button",
"aaSorting": [[ 1, "asc" ]],
}));
});
</script>
</head>
<body id="labels_label-manage" class="tools labels">
[% INCLUDE 'header.inc' %]
@ -99,27 +113,29 @@
[% IF ( table_loop ) %]
<form name="layouts" action="/cgi-bin/koha/label-manage.pl?label_element=[% label_element %]">
<h2>Currently Available [% label_element_title %]</h2>
<table>
<table id="labels-table">
[% FOREACH table_loo IN table_loop %]
[% IF ( table_loo.header_fields ) %]
<tr>
[% FOREACH header_field IN table_loo.header_fields %]
<th>[% header_field.field_label %]</th>
[% END %]
</tr>
[% ELSE %]
<tr>
[% FOREACH text_field IN table_loo.text_fields %]
[% IF ( text_field.select_field ) %]
<td align="center"><input type="checkbox" name="action" value="[% text_field.field_value %]" /></td>
[% ELSIF ( text_field.field_value ) %]
<td>[% text_field.field_value %]</td>
[% ELSE %]
<td>&nbsp;</td>
[% END %]
[% END %]
</tr>
[% END %]
[% IF ( table_loo.header_fields ) %]
<thead>
<tr>
[% FOREACH header_field IN table_loo.header_fields %]
<th>[% header_field.field_label %]</th>
[% END %]
</tr>
</thead>
[% ELSE %]
<tr>
[% FOREACH text_field IN table_loo.text_fields %]
[% IF ( text_field.select_field ) %]
<td align="center"><input type="checkbox" name="action" value="[% text_field.field_value %]" /></td>
[% ELSIF ( text_field.field_value ) %]
<td>[% text_field.field_value %]</td>
[% ELSE %]
<td>&nbsp;</td>
[% END %]
[% END %]
</tr>
[% END %]
[% END %]
</table>
<fieldset class="action">

4
labels/label-print.pl
View file

@ -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,