From 2f27b78cf93e33b784f50f0c4ea5d71583532da7 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Tue, 20 May 2014 08:46:47 -0700 Subject: [PATCH] LP#1296937: (follow-up) make $ids_only be the last parameter for ->charged_items() This change ensures that if a site fails to upgrade SIPServer at the same time that they upgrade Evergreen, the renew all message won't break on them. Signed-off-by: Galen Charlton --- Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm | 4 ++-- Open-ILS/src/perlmods/lib/OpenILS/SIP/Transaction/RenewAll.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm index e1a4b9e000..7e998f8152 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm @@ -461,7 +461,7 @@ sub hold_items { # all of my open holds - my $holds = $self->{editor}->search_action_hold_request({ + my $holds = $self->{editor}->search_action_hold_request({ usr => $self->{user}->id, fulfillment_time => undef, cancel_time => undef @@ -741,7 +741,7 @@ sub __circ_to_title { # force_bc -- return barcode data regardless of msg64_summary_datatype sub charged_items { - my ($self, $start, $end, $ids_only, $force_bc) = shift; + my ($self, $start, $end, $force_bc, $ids_only) = shift; $self->__patron_items_info(); diff --git a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Transaction/RenewAll.pm b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Transaction/RenewAll.pm index 5b199b296d..675d6adee3 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Transaction/RenewAll.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Transaction/RenewAll.pm @@ -31,7 +31,7 @@ sub do_renew_all { my $self = shift; my $sip = shift; - my $barcodes = $self->patron->charged_items(undef, undef, 0, 1); + my $barcodes = $self->patron->charged_items(undef, undef, 1); syslog('LOG_INFO', "OILS: RenewalAll for user ". $self->patron->{id} ." and items [@$barcodes]"); -- 2.11.0