Bugzilla – Attachment 138710 Details for
Bug 30646
Add option to send WELCOME notice for new patrons added at first login via LDAP/SAML
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30646: (follow-up) Set to send immediately
Bug-30646-follow-up-Set-to-send-immediately.patch (text/plain), 3.25 KB, created by
Kyle M Hall (khall)
on 2022-08-05 14:50:21 UTC
(
hide
)
Description:
Bug 30646: (follow-up) Set to send immediately
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2022-08-05 14:50:21 UTC
Size:
3.25 KB
patch
obsolete
>From 3843cd4348bbc941740afedf1b802b7ad5852cfb Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Thu, 16 Jun 2022 15:23:28 +0100 >Subject: [PATCH] Bug 30646: (follow-up) Set to send immediately > >Other welcome notices send immediately rather than waiting on the queue >to be processed.. these one's should too. > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > C4/Auth_with_ldap.pm | 10 ++++++---- > C4/Auth_with_shibboleth.pm | 8 ++++---- > 2 files changed, 10 insertions(+), 8 deletions(-) > >diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm >index 915c7a8edfc..8efa1b03533 100644 >--- a/C4/Auth_with_ldap.pm >+++ b/C4/Auth_with_ldap.pm >@@ -23,7 +23,7 @@ use Carp qw( croak ); > use C4::Context; > use C4::Members::Messaging; > use C4::Auth qw( checkpw_internal ); >-use C4::Letters qw( GetPreparedLetter EnqueueLetter ); >+use C4::Letters qw( GetPreparedLetter EnqueueLetter SendQueuedMessages ); > use Koha::Patrons; > use Koha::AuthUtils qw( hash_password ); > use Net::LDAP; >@@ -239,9 +239,10 @@ sub checkpw_ldap { > my $letter = GetPreparedLetter( > module => 'members', > letter_code => 'WELCOME', >- branchcode => $patron->branchcode,, >- lang => $patron->lang || 'default', >- tables => { >+ branchcode => $patron->branchcode, >+ , >+ lang => $patron->lang || 'default', >+ tables => { > 'branches' => $patron->branchcode, > 'borrowers' => $patron->borrowernumber, > }, >@@ -256,6 +257,7 @@ sub checkpw_ldap { > message_transport_type => 'email' > } > ); >+ SendQueuedMessages( { message_id => $message_id } ); > }; > } > } >diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm >index f71d7ce7d62..398d7db2d86 100644 >--- a/C4/Auth_with_shibboleth.pm >+++ b/C4/Auth_with_shibboleth.pm >@@ -23,7 +23,7 @@ use C4::Context; > use Koha::AuthUtils qw( get_script_name ); > use Koha::Database; > use Koha::Patrons; >-use C4::Letters qw( GetPreparedLetter EnqueueLetter ); >+use C4::Letters qw( GetPreparedLetter EnqueueLetter SendQueuedMessages ); > use C4::Members::Messaging; > use Carp qw( carp ); > use List::MoreUtils qw( any ); >@@ -153,9 +153,8 @@ sub _autocreate { > module => 'members', > letter_code => 'WELCOME', > branchcode => $patron->branchcode, >- , >- lang => $patron->lang || 'default', >- tables => { >+ lang => $patron->lang || 'default', >+ tables => { > 'branches' => $patron->branchcode, > 'borrowers' => $patron->borrowernumber, > }, >@@ -170,6 +169,7 @@ sub _autocreate { > message_transport_type => 'email' > } > ); >+ SendQueuedMessages( { message_id => $message_id } ); > }; > } > } >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30646
:
134272
|
134279
|
136171
|
136172
|
136173
|
138708
|
138709
|
138710
|
141117
|
141118
|
141119
|
141120
|
141121