From 5cf0b1c5af678100f3b889808b1d8a0ba9e934c4 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 1 Jun 2017 13:29:45 -0300 Subject: [PATCH] Bug 18789: Use Koha::Patron->image from the templates Now that we have the 'patron' variable in all our templates, we can call Koha::Patron->image and do the check from the templates. Test plan: On the different pages of the patron module, you should see the default image if there is no image attached or the one that has been attached (see pref patronimages) --- circ/circulation.pl | 1 - koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 4 ++-- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 14 +++++++------- members/boraccount.pl | 2 -- members/deletemem.pl | 1 - members/discharge.pl | 2 -- members/files.pl | 2 -- members/housebound.pl | 4 +--- members/mancredit.pl | 1 - members/maninvoice.pl | 1 - members/member-flags.pl | 2 -- members/member-password.pl | 2 -- members/moremember.pl | 5 ----- members/notices.pl | 2 -- members/pay.pl | 3 --- members/paycollect.pl | 4 ---- members/printfeercpt.pl | 2 -- members/printinvoice.pl | 2 -- members/purchase-suggestions.pl | 2 -- members/readingrec.pl | 2 -- members/routing-lists.pl | 2 -- members/statistics.pl | 2 -- 22 files changed, 10 insertions(+), 52 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 2ba165796c..db329d46cb 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -607,7 +607,6 @@ if ( $patron ) { categoryname => $patron->category->description, expiry => $patron->dateexpiry, is_child => ( $patron->category->category_type eq 'C' ), - picture => ( $patron->image ? 1 : 0 ), ); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index c54ba30806..0a60dfd580 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -7,7 +7,7 @@