From 81e8b65ea1289c4de5f069bcfe16f77b62671a5c Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 27 May 2011 07:46:06 +0200 Subject: [PATCH] Bug 6415: Can't make patron card batch Content-Type: text/plain; charset="utf-8" TT corrections from bug 6343 for label creator were also needed for patron card creator. - Manage Batch and New Batch were missing the branch info - Add link on patron search was missing batch id parameter To test: - Check branch is correctly shown on pages 'Manage Batch' and 'New Batch' - Check you can create a new batch and add names to it by using the 'Add' right to the patron's name --- .../prog/en/modules/patroncards/members-search.tt | 2 +- patroncards/edit-batch.pl | 2 +- patroncards/manage.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt index 55095d9..a67c080 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt @@ -118,7 +118,7 @@ function add_item(borrowernum,batch_id,type_id){ [% resultsloo.branchcode %] [% resultsloo.dateexpiry %] [% resultsloo.borrowernotes %] - Add + Add [% END %] diff --git a/patroncards/edit-batch.pl b/patroncards/edit-batch.pl index 449e82a..50bbbf4 100755 --- a/patroncards/edit-batch.pl +++ b/patroncards/edit-batch.pl @@ -60,7 +60,7 @@ my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number'); my @borrower_numbers = $cgi->param('borrower_number') if $cgi->param('borrower_number'); my $errstr = $cgi->param('error') || ''; -my $branch_code = get_branch_code_from_name($template->param('LoginBranchname')); +my $branch_code = get_branch_code_from_name($template->{VARS}->{'LoginBranchname'}); if ($op eq 'remove') { $batch = C4::Patroncards::Batch->retrieve(batch_id => $batch_id); diff --git a/patroncards/manage.pl b/patroncards/manage.pl index 2a449ba..71e1b82 100755 --- a/patroncards/manage.pl +++ b/patroncards/manage.pl @@ -73,7 +73,7 @@ my $display_columns = { layout => [ # db column => {col label }; my $errstr = ($cgi->param('error') ? $cgi->param('error') : ''); -my $branch_code = ($card_element eq 'batch' ? get_branch_code_from_name($template->param('LoginBranchname')) : ''); +my $branch_code = ($card_element eq 'batch' ? get_branch_code_from_name($template->{VARS}->{'LoginBranchname'}) : ''); if ($op eq 'delete') { my $err = 0; -- 1.7.4.1