X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=labels%2Flabel-manage.pl;h=01a7d5babe956e4c6bba212c1383331d9169b209;hb=9d6d641d1f8b77271800f43bc027b651f9aea52b;hp=7ef3300a437afe41aeb5852fe46b73a8cc497f02;hpb=b2b16fb8cf4bf89862eba6fc14d507dc79de4db7;p=srvgit

diff --git a/labels/label-manage.pl b/labels/label-manage.pl
index 7ef3300a43..01a7d5babe 100755
--- a/labels/label-manage.pl
+++ b/labels/label-manage.pl
@@ -5,41 +5,41 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
-use vars qw($debug);
+use Modern::Perl;
 
-use CGI;
-use Data::Dumper;
+use CGI qw ( -utf8 );
 
-use C4::Auth qw(get_template_and_user);
-use C4::Output qw(output_html_with_http_headers);
-use autouse 'C4::Branch' => qw(get_branch_code_from_name);
-use C4::Creators;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Creators qw(
+    get_all_layouts
+    get_all_profiles
+    get_all_templates
+    get_batch_summary
+    html_table
+);
 use C4::Labels;
 
-my $cgi = new CGI;
+my $cgi = CGI->new;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "labels/label-manage.tmpl",
+        template_name   => "labels/label-manage.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
-        debug           => 1,
     }
 );
 
@@ -50,26 +50,31 @@ my $display_columns = { layout =>   [  # db column       => {col label
                                         {barcode_type    => {label => 'Barcode Type',   link_field      => 0}},
                                         {printing_type   => {label => 'Print Type',     link_field      => 0}},
                                         {format_string   => {label => 'Fields to Print',link_field      => 0}},
-                                        {select          => {label => 'Select',         value           => 'layout_id'}},
+                                        {select         => {label => 'Actions',         value           => 'layout_id'}},
                                     ],
-                        template => [   {template_id     => {label => 'Template ID',    link_field      => 0}},
+                        template => [
+                                        {template_id     => {label => 'Template ID',    link_field      => 0}},
                                         {template_code   => {label => 'Template Name',  link_field      => 0}},
                                         {template_desc   => {label => 'Description',    link_field      => 0}},
-                                        {select          => {label => 'Select',         value           => 'template_id'}},
+                                        {select         => {label => 'Actions',         value           => 'template_id'}},
                                     ],
-                        profile =>  [   {profile_id      => {label => 'Profile ID',     link_field      => 0}},
+                        profile =>  [
+                                        {profile_id      => {label => 'Profile ID',     link_field      => 0}},
                                         {printer_name    => {label => 'Printer Name',   link_field      => 0}},
                                         {paper_bin       => {label => 'Paper Bin',      link_field      => 0}},
-                                        {_template_code  => {label => 'Template Name',  link_field      => 0}},     # this display column does not have a corrisponding db column in the profile table, hence the underscore
-                                        {select          => {label => 'Select',         value           => 'profile_id'}},
+                                        {_template_code  => {label => 'Template Name',  link_field      => 0}},     # this display column does not have a corresponding db column in the profile table, hence the underscore
+                                        {select          => {label => 'Actions',         value           => 'profile_id'}},
                                     ],
-                        batch =>    [   {batch_id        => {label => 'Batch ID',       link_field      => 0}},
+                        batch =>    [
+                                        {batch_id        => {label => 'Batch ID',       link_field      => 0}},
+                                        {description     => {label => 'Description',    link_field      => 0}},
                                         {_item_count     => {label => 'Item Count',     link_field      => 0}},
-                                        {select          => {label => 'Select',         value           => 'batch_id'}},
+                                        {select          => {label => 'Actions',         value           => 'batch_id'}},
+                                        {select1         => {label => ' ',           link_field       => 'batch_id'}},
                                     ],
 };
 
-my $label_element = $cgi->param('label_element') || 'template';   # default to template managment
+my $label_element = $cgi->param('label_element') || 'template';   # default to template management
 my $op = $cgi->param('op') || 'none';
 my $element_id = $cgi->param('element_id') || undef;
 my $error = $cgi->param('error') || 0;
@@ -84,10 +89,10 @@ if ($op eq 'delete') {
     else                                        {}      # FIXME: Some error trapping code
 }
 
-if      ($label_element eq 'layout')    {$db_rows = get_all_layouts(table_name => 'creator_layouts', filter => 'creator=\'Labels\'');}
-elsif   ($label_element eq 'template')  {$db_rows = get_all_templates(table_name => 'creator_templates', filter => 'creator=\'Labels\'');}
-elsif   ($label_element eq 'profile')   {$db_rows = get_all_profiles(table_name => 'printers_profile', filter => 'creator=\'Labels\'');}
-elsif   ($label_element eq 'batch')     {$db_rows = get_batch_summary(filter => "branch_code=\'$branch_code\' OR branch_code=\'NB\'", creator => 'Labels');}
+if      ($label_element eq 'layout')    {$db_rows = get_all_layouts( { filters => { creator => 'Labels' } });}
+elsif   ($label_element eq 'template')  {$db_rows = get_all_templates( { filters => { creator => 'Labels' } });}
+elsif   ($label_element eq 'profile')   {$db_rows = get_all_profiles( { filters => { creator => 'Labels' } });}
+elsif   ($label_element eq 'batch')     {$db_rows = get_batch_summary( { filters => { branch_code => [$branch_code, 'NB'], creator => 'Labels' } });}
 else                                    {}      # FIXME: Some error trapping code
 
 my $table = html_table($display_columns->{$label_element}, $db_rows);
@@ -95,16 +100,16 @@ my $table = html_table($display_columns->{$label_element}, $db_rows);
 $template->param(error => $error) if ($error) && ($error ne 0);
 $template->param(print => 1) if ($label_element eq 'batch');
 $template->param(
-                op              => $op,
-                element_id      => $element_id,
-                table_loop      => $table,
-                label_element   => $label_element,
-                label_element_title     => ($label_element eq 'layout' ? 'Layouts' :
-                                            $label_element eq 'template' ? 'Templates' :
-                                            $label_element eq 'profile' ? 'Profiles' :
-                                            $label_element eq 'batch' ? 'Batches' :
-                                            ''
-                                            ),
+    op              => $op,
+    element_id      => $element_id,
+    table_loop      => $table,
+    label_element   => $label_element,
+    label_element_title => (
+        $label_element eq 'layout'   ? 'Layouts' :
+        $label_element eq 'template' ? 'Templates' :
+        $label_element eq 'profile'  ? 'Profiles' :
+        $label_element eq 'batch'    ? 'Batches' :
+        '' )
 );
 
 output_html_with_http_headers $cgi, $cookie, $template->output;