From 3c56bb1a93d3497e9c0af71cab9fe0d517cceef4 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 20 Oct 2022 14:53:33 +0000 Subject: [PATCH] Bug 31422: [22.05.x] Add patron's current category to dropdown while editing Signed-off-by: David Nind Signed-off-by: Katrin Fischer Bug 31422: (QA follow-up) Fix terminology and switch icon * fa-exclamation-circle looks more like 'info', but I feel this should be more of a warning, so switched to fa-exclamation-triangle * Changed branches to libraries in message Signed-off-by: Katrin Fischer --- .../prog/en/modules/members/memberentrygen.tt | 3 +++ members/memberentry.pl | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 1a58a60751..1c16927c93 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -935,6 +935,9 @@ legend:hover { [% END # /FOREACH categoryloo %] [% END # /FOREACH typeloo %] + [% IF limited_category %] + + [% END %] Required diff --git a/members/memberentry.pl b/members/memberentry.pl index 344be77070..05559b869c 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -677,6 +677,17 @@ foreach my $category_type (qw(C A S P I X)) { $no_categories = 0 if $patron_categories->count > 0; my @categoryloop; + unless ( (!defined $categorycode) || $patron_categories->find( $categorycode ) ){ + my $category = Koha::Patron::Categories->find( $categorycode ); + $template->param( limited_category => 1 ); + push @categoryloop, + { 'category_code' => $category->categorycode, + 'categoryname' => $category->description, + 'effective_min_password_length' => $category->effective_min_password_length, + 'effective_require_strong_password' => $category->effective_require_strong_password. + 'categorycodeselected' => 1 + }; + } while ( my $patron_category = $patron_categories->next ) { $categorycode = $patron_category->categorycode unless defined($categorycode); #If none passed in, select the first push @categoryloop, -- 2.30.2