From 27a6df3ec9c74151aef097aa8609a59f964be1ab Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 5 Jun 2015 08:06:29 -0400 Subject: [PATCH] Bug 14338 - Unable to delete patron images [3.16.x] The call to RmPatronImage is still passing cardnumber as its parameter instead of borrowernumber. Test Plan: 1) Upload a patron image 2) Ensure the card number is not the same as the borrower number 3) Attempt to delete patron image -- Image will remain 4) Apply this patch 5) Attempt to delete patron image -- Image will be removed 6) run koha qa test tools NOTE: Deletion worked in 3.16.x, though the message for debugging differed (cardnumber vs. borrowernumber). This effectively removes cardnumber from the URL and messages for the delete operation. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- tools/picture-upload.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index f87defb..9a124ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -261,7 +261,7 @@ function validate1(date) {
- [% IF ( picture ) %]Delete[% END %] + [% IF ( picture ) %]Delete[% END %]
diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl index b2aa18a..44a715d 100755 --- a/tools/picture-upload.pl +++ b/tools/picture-upload.pl @@ -147,7 +147,7 @@ if ( ($op eq 'Upload') && $uploadfile ) { # Case is important in these ope $template->param(filetype => $filetype); } elsif ( $op eq 'Delete' ) { my $dberror = RmPatronImage($borrowernumber); - $debug and warn "Patron image deleted for $cardnumber"; + $debug and warn "Patron image deleted for $borrowernumber"; warn "Database returned $dberror" if $dberror; } if ( $borrowernumber && !$errors && !$template->param('ERRORS') ) { -- 2.1.4