From e822db30d10695bf68a616c5c6f6e81db3558f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Wed, 30 Dec 2015 14:37:03 +0100 Subject: [PATCH] Bug 15135: Get rid of Warning 'Subroutine HasOverdues redefined' This patch renames the subroutine HasOverdues to WithOverdues in Koha/Template/Plugin/Borrowers.pm and in members-toolbar.inc (only place where it is used). To test: - First test without patch - Search for a patron with overdues (I used the 'Overdues' report on page Home > Cirulation - Display detail page, open drop down tool 'Print'. Verify that you have an item 'Print overdues' - Apply patch - Repeat steps above. Verify that the item 'Print overdues' still appears - Search for remaining occurences of HasOverdues in template files / template includes with git grep 'Patrons.HasOverdues'. There should not be any occurences. --- Koha/Template/Plugin/Borrowers.pm | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Koha/Template/Plugin/Borrowers.pm b/Koha/Template/Plugin/Borrowers.pm index 3e2c59b..1918017 100644 --- a/Koha/Template/Plugin/Borrowers.pm +++ b/Koha/Template/Plugin/Borrowers.pm @@ -49,7 +49,7 @@ sub IsDebarred { return Koha::Borrower::Debarments::IsDebarred($borrower->{borrowernumber}); } -sub HasOverdues { +sub WithOverdues { my ( $self, $borrowernumber ) = @_; return unless $borrowernumber; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index 641bbad..c30d447 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -160,7 +160,7 @@ function searchToHold(){ [% IF ( CAN_user_borrowers ) %]
  • Print summary
  • [% END %]
  • Print slip
  • Print quick slip
  • - [% IF Borrowers.HasOverdues( borrowernumber ) %] + [% IF Borrowers.WithOverdues( borrowernumber ) %]
  • Print overdues
  • [% END %] -- 1.7.10.4