From e0c37b2b6b3409cc39773a62cc45c4102d27a1dc Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Sun, 5 Jul 2015 13:17:02 +0200 Subject: [PATCH] Bug 11693: Default emailing preferences not loaded for self registering patron MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The call to AddMember_Opac does not take care of the messaging prefs when enhanced messaging is enabled. This patch adds the call to handle_form_action to do that. Test plan: Enable self registering patrons and enhanced messaging. Check the (default) message prefs for the relevant patron category. At least enable email for one notice. Self-register a user with and without verification email enabled. Check in both cases that the message prefs of the user conform to those in the patron category. (So at least one enabled.) Followed test plan, works as expected. Signed-off-by: Marc Véron Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit f7ed250d618c57a3fc00728bbb93460b25ceda52) Signed-off-by: Chris Cormack Signed-off-by: Liz Rea --- opac/opac-memberentry.pl | 2 ++ opac/opac-registration-verify.pl | 2 ++ 2 files changed, 4 insertions(+) diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl index 76fd32b453..1832df41c4 100755 --- a/opac/opac-memberentry.pl +++ b/opac/opac-memberentry.pl @@ -24,6 +24,7 @@ use String::Random qw( random_string ); use C4::Auth; use C4::Output; use C4::Members; +use C4::Form::MessagingPreferences; use Koha::Borrower::Modifications; use C4::Branch qw(GetBranchesLoop); use C4::Scrubber; @@ -144,6 +145,7 @@ if ( $action eq 'create' ) { C4::Context->preference('OpacPasswordChange') ); my ( $borrowernumber, $password ) = AddMember_Opac(%borrower); + C4::Form::MessagingPreferences::handle_form_action($cgi, { borrowernumber => $borrowernumber }, $template, 1, C4::Context->preference('PatronSelfRegistrationDefaultCategory') ) if $borrowernumber && C4::Context->preference('EnhancedMessagingPreferences'); $template->param( password_cleartext => $password ); $template->param( diff --git a/opac/opac-registration-verify.pl b/opac/opac-registration-verify.pl index a45b5340a4..c39da42b13 100755 --- a/opac/opac-registration-verify.pl +++ b/opac/opac-registration-verify.pl @@ -22,6 +22,7 @@ use CGI; use C4::Auth; use C4::Output; use C4::Members; +use C4::Form::MessagingPreferences; use Koha::Borrower::Modifications; my $cgi = new CGI; @@ -56,6 +57,7 @@ if ( $m->Verify() ) { if ($borrowernumber) { Koha::Borrower::Modifications->DelModifications({ verification_token => $token }); + C4::Form::MessagingPreferences::handle_form_action($cgi, { borrowernumber => $borrowernumber }, $template, 1, C4::Context->preference('PatronSelfRegistrationDefaultCategory') ) if C4::Context->preference('EnhancedMessagingPreferences'); $template->param( password_cleartext => $password ); $template->param( -- 2.39.5