From a1322829cbe3c1a542bc5be17ef0328333892df2 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 3 Feb 2021 16:14:12 +0100 Subject: [PATCH] Bug 27604: [19.11] Make sure PatronSelfRegistrationLibraryList is used The value of PatronSelfRegistrationLibraryList is used to display the dropdown list of the libraries, but not after the form is submitted. Test plan: 1. Empty PatronSelfRegistrationLibraryList 2. Self register a new patron => Confirm the dropdown list with the libraries contain all the libraries 3. Fill in PatronSelfRegistrationLibraryList with branchcodes (eg. "CPL|MPL") 4. Self register a new patron 5. Edit the HTML form and replace the option's value with another branchcode (FPL) 6. Save => Without this patch the branchcode FPL is used => With this patch applied an ugly 500 is returned Signed-off-by: Lucas Gass Signed-off-by: Nick Clemens https://bugs.koha-community.org/show_bug.cgi?id=11983 Bug 27604: (QA follow-up) Limit the libraries during the query Signed-off-by: Nick Clemens https://bugs.koha-community.org/show_bug.cgi?id=11983 Bug 27604: Init to {} Bug 27604: Deal with empty pref Signed-off-by: Victor Grousset/tuxayo --- opac/opac-memberentry.pl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl index 8d541a456c..1af3d47b27 100755 --- a/opac/opac-memberentry.pl +++ b/opac/opac-memberentry.pl @@ -75,10 +75,14 @@ if ( $action eq q{} ) { my $mandatory = GetMandatoryFields($action); -my @libraries = Koha::Libraries->search; -if ( my @libraries_to_display = split '\|', C4::Context->preference('PatronSelfRegistrationLibraryList') ) { - @libraries = map { my $b = $_; my $branchcode = $_->branchcode; grep( /^$branchcode$/, @libraries_to_display ) ? $b : () } @libraries; +my $params = {}; +if ( $action eq 'create' || $action eq 'new' ) { + my @PatronSelfRegistrationLibraryList = split '\|', C4::Context->preference('PatronSelfRegistrationLibraryList'); + $params = { branchcode => { -in => \@PatronSelfRegistrationLibraryList } } + if @PatronSelfRegistrationLibraryList; } +my @libraries = Koha::Libraries->search($params); + my ( $min, $max ) = C4::Members::get_cardnumber_length(); if ( defined $min ) { $template->param( @@ -148,6 +152,8 @@ if ( $action eq 'create' ) { borrower => \%borrower ); $template->param( patron_attribute_classes => GeneratePatronAttributesForm( undef, $attributes ) ); + } elsif ( ! grep { $borrower{branchcode} eq $_->branchcode } @libraries ) { + die "Branchcode not allowed"; # They hack the form } else { if ( -- 2.39.5