From fda21fbc28867da1043c2ef7aed1213e7cd4defd Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 6 May 2013 12:29:01 -0400 Subject: [PATCH] Bug 10204 - Patron image no longer appears in the OPAC With the addition of opac-memberentry.pl to the OPAC we lost a way to display the image associated with a patron's account. This patch adds display of the patron image to opac-memberentry.pl now that opac-userdetails.pl and opac-userupdate.pl are deprecated. To test: 1. Log into the OPAC as a patron who has an image associated with their account. View the "my personal details" tab and confirm that the patron image appears with and without OPACPatronDetails enabled. 2. Log into the OPAC as a patron who has no image associated with their account. View the "my personal details" tab and confirm that the layout looks correct. 3. Turn off OPACpatronimages and confirm that the "my personal details" page looks correct. Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer Tested with OpacPatronDetails and OpacPatronImags turned on/off and it's working well. Template only changes. Signed-off-by: Jared Camins-Esakov (cherry picked from commit afccbfcce7192c6e1fcd73f137135cb5289c3d3d) Signed-off-by: Jared Camins-Esakov --- .../prog/en/modules/opac-memberentry.tt | 37 ++++++++++++------- opac/opac-memberentry.pl | 13 ++++++- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt index 95149b37da..8eda35232f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt @@ -34,12 +34,13 @@
-
- [% IF action == 'edit' %] -
- [% ELSE %] -
- [% END %] +
+ [% IF action == 'edit' %] +
+ [% ELSE %] +
+ [% END %] +
[% IF action == 'edit' %]

[% borrower.firstname %] [% borrower.surname %]'s account ⇢ Personal details

[% ELSE %] @@ -60,8 +61,6 @@
You typed in the wrong characters in the box before submitting. Please try again.
[% END %] - - [% UNLESS hidden.defined('branchcode') %] @@ -93,12 +92,16 @@ [% END %] - +
[% UNLESS hidden.defined('title') && hidden.defined('surname') && hidden.defined('firstname') && hidden.defined('dateofbirth') && hidden.defined('initials') && hidden.defined('othernames') && hidden.defined('sex') %] +
+ [% IF ( display_patron_image ) %] +
+ [% END %]
Identity @@ -228,8 +231,18 @@ [% END %]
+ [% IF ( display_patron_image ) %] +
+
+

+ +

+
+ [% END %] +
[% END %] +
[% UNLESS hidden.defined('streetnumber') && hidden.defined('address') && hidden.defined('address2') && hidden.defined('city') && hidden.defined('state') && hidden.defined('zipcode') && @@ -741,11 +754,9 @@ [% END %] - - - +
-
+
diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl index 7f8230d414..112d405fb2 100755 --- a/opac/opac-memberentry.pl +++ b/opac/opac-memberentry.pl @@ -195,8 +195,19 @@ elsif ( $action eq 'update' ) { } } elsif ( $action eq 'edit' ) { #Display logged in borrower's data + my $borrower = GetMember( borrowernumber => $borrowernumber ); $template->param( - borrower => GetMember( borrowernumber => $borrowernumber ), ); + borrower => $borrower, ); + + if (C4::Context->preference('OPACpatronimages')) { + my ($image, $dberror) = GetPatronImage($borrower->{cardnumber}); + if ($image) { + $template->param( + display_patron_image => 1 + ); + } + } + } my $captcha = random_string("CCCCC"); -- 2.39.5