Attachment 141967 Details for Bug 27265 – Bug 27265: (follow-up) Use existing parameter

[patch] Bug 27265: (follow-up) Use existing parameter

Bug-27265-follow-up-Use-existing-parameter.patch (text/plain), 2.09 KB, created by Marcel de Rooy on 2022-10-17 13:10:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2022-10-17 13:10:14 UTC

Size: 2.09 KB

patch

obsolete

>From 07667be6862a089fec6d8267cba4e43385cdf68b Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Fri, 30 Sep 2022 12:32:25 +0000
>Subject: [PATCH] Bug 27265: (follow-up) Use existing parameter
>Content-Type: text/plain; charset=utf-8
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> C4/Letters.pm | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
>diff --git a/C4/Letters.pm b/C4/Letters.pm
>index 71cbd1d4d1..18de083518 100644
>--- a/C4/Letters.pm
>+++ b/C4/Letters.pm
>@@ -977,7 +977,7 @@ sub SendQueuedMessages {
>         'limit'          => $params->{'limit'} // 0,
>         'borrowernumber' => $params->{'borrowernumber'} // q{},
>         'letter_code'    => $params->{'letter_code'} // q{},
>-        'type'           => $params->{'type'} // q{},
>+        'message_transport_type'           => $params->{'type'} // q{},
>     };
>     my $unsent_messages = _get_unsent_messages( $which_unsent_messages );
>     MESSAGE: foreach my $message ( @$unsent_messages ) {
>@@ -1257,10 +1257,6 @@ sub _get_unsent_messages {
> 
>     my @query_params = ('pending');
>     if ( ref $params ) {
>-        if ( $params->{'message_transport_type'} ) {
>-            $statement .= ' AND mq.message_transport_type = ? ';
>-            push @query_params, $params->{'message_transport_type'};
>-        }
>         if ( $params->{'borrowernumber'} ) {
>             $statement .= ' AND mq.borrowernumber = ? ';
>             push @query_params, $params->{'borrowernumber'};
>@@ -1273,8 +1269,8 @@ sub _get_unsent_messages {
>                 push @query_params, @letter_codes;
>             }
>         }
>-        if ( $params->{'type'} ) {
>-            my @types = ref $params->{'type'} eq "ARRAY" ? @{$params->{'type'}} : $params->{'type'};
>+        if ( $params->{'message_transport_type'} ) {
>+            my @types = ref $params->{'message_transport_type'} eq "ARRAY" ? @{$params->{'message_transport_type'}} : $params->{'message_transport_type'};
>             if ( @types ) {
>                 my $q = join( ",", ("?") x @types );
>                 $statement .= " AND message_transport_type IN ( $q ) ";
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 27265: 114522 | 114523 | 114525 | 115430 | 121717 | 130476 | 131434 | 138712 | 141129 | 141130 | 141966 | 141967 | 141968