46bbfa12a1
(Apparently) unlike HTML::Template::Pro, Template Toolkit doesn't like
template variables that are entirely numeric -- in conditionals, it
consider them integers, most of which are Perl true.
This patch changes this by setting the error variable to the error
value.
To test:
[1] Run the test plan from the previous patch. In each
case, verify that the error message is specifically applicable
to the test. For example, if you try uplaoading a patron image
that is larger than 500KB, the error message displayed should
specifically say so.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Thank you Galen for catching this. Error messages showing up
now are much more specific and according to the error codes given.
I testd uploading a file larger then 500KB and triggered several
error messages giving the error code in the URL:
/cgi-bin/koha/patroncards/manage.pl?card_element=profile&error=201
All tests and QA script pass.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
119 lines
6.5 KiB
Perl
Executable file
119 lines
6.5 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
#
|
|
# Copyright 2006 Katipo Communications.
|
|
# Parts Copyright 2009 Foundations Bible College.
|
|
#
|
|
# 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 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.
|
|
|
|
use strict;
|
|
use warnings;
|
|
use vars qw($debug);
|
|
|
|
use CGI;
|
|
use autouse 'Data::Dumper' => qw(Dumper);
|
|
|
|
use C4::Auth qw(get_template_and_user);
|
|
use C4::Output qw(output_html_with_http_headers);
|
|
use C4::Creators;
|
|
use C4::Patroncards;
|
|
use C4::Labels;
|
|
|
|
my $cgi = new CGI;
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "patroncards/manage.tmpl",
|
|
query => $cgi,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { catalogue => 1 },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
my $op = $cgi->param('op') || 'none';
|
|
my $card_element = $cgi->param('card_element') || 'template'; # default to template managment
|
|
my $element_id = $cgi->param('element_id') || 0; # there should never be an element with a id of 0 so this is a safe default
|
|
|
|
my $db_rows = {};
|
|
my $display_columns = { layout => [ # db column => {col label is link?
|
|
{layout_id => {label => 'Layout ID', link_field => 0}},
|
|
{layout_name => {label => 'Layout', link_field => 0}},
|
|
#{layout_xml => {label => 'Layout XML', link_field => 0}},
|
|
{select => {label => 'Select', value => 'layout_id'}},
|
|
],
|
|
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'}},
|
|
],
|
|
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'}},
|
|
],
|
|
batch => [ {batch_id => {label => 'Batch ID', link_field => 0}},
|
|
{_item_count => {label => 'Item Count', link_field => 0}},
|
|
{select => {label => 'Select', value => 'batch_id'}},
|
|
],
|
|
};
|
|
|
|
my $errstr = ($cgi->param('error') ? $cgi->param('error') : '');
|
|
my $branch_code = ($card_element eq 'batch' ? C4::Context->userenv->{'branch'} : '');
|
|
|
|
if ($op eq 'delete') {
|
|
my $err = 0;
|
|
if ($card_element eq 'layout') {$err = C4::Patroncards::Layout::delete(layout_id => $element_id);}
|
|
elsif ($card_element eq 'template') {$err = C4::Patroncards::Template::delete(template_id => $element_id);}
|
|
elsif ($card_element eq 'profile') {$err = C4::Patroncards::Profile::delete(profile_id => $element_id);}
|
|
elsif ($card_element eq 'batch') {$err = C4::Labels::Batch::delete(batch_id => $element_id, branch_code => $branch_code);}
|
|
else {warn sprintf("Unknown card element passed in for delete operation: %s.",$card_element); $errstr = 202;}
|
|
print $cgi->redirect("manage.pl?card_element=$card_element" . ($err ? "&error=102" : ''));
|
|
exit;
|
|
}
|
|
elsif ($op eq 'none') {
|
|
if ($card_element eq 'layout') {$db_rows = get_all_layouts(table_name => 'creator_layouts', filter => 'creator=\'Patroncards\'');}
|
|
elsif ($card_element eq 'template') {$db_rows = get_all_templates(table_name => 'creator_templates', filter => 'creator=\'Patroncards\'');}
|
|
elsif ($card_element eq 'profile') {$db_rows = get_all_profiles(table_name => 'printers_profile', filter => 'creator=\'Patroncards\'');}
|
|
elsif ($card_element eq 'batch') {$db_rows = get_batch_summary(filter => "branch_code=\'$branch_code\' OR branch_code=\'NB\'", creator => 'Patroncards');}
|
|
else {warn sprintf("Unknown card element passed in: %s.",$card_element); $errstr = 202;}
|
|
}
|
|
else { # trap unsupported operations here
|
|
warn sprintf('Manage interface called an unsupported operation: %s',$op);
|
|
print $cgi->redirect("manage.pl?card_element=$card_element&error=201");
|
|
exit;
|
|
}
|
|
|
|
my $table = html_table($display_columns->{$card_element}, $db_rows);
|
|
|
|
$template->param(print => 1) if ($card_element eq 'batch');
|
|
$template->param(
|
|
error => $errstr,
|
|
);
|
|
$template->param(
|
|
op => $op,
|
|
element_id => $element_id,
|
|
table_loop => $table,
|
|
card_element => $card_element,
|
|
card_element_title => ($card_element eq 'layout' ? 'Layouts' :
|
|
$card_element eq 'template' ? 'Templates' :
|
|
$card_element eq 'profile' ? 'Profiles' :
|
|
$card_element eq 'batch' ? 'Batches' :
|
|
''
|
|
),
|
|
);
|
|
|
|
output_html_with_http_headers $cgi, $cookie, $template->output;
|