From efe1cd3dd40a9632e8660f38a58b844458a39647 Mon Sep 17 00:00:00 2001 From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Date: Wed, 1 Jun 2022 09:54:25 +0200 Subject: [PATCH] Bug 30874: Replace categoryname Content-Type: text/plain; charset=utf-8 == Test plan == 1. Apply all patches 2. Create a new patron in a given category => Form show the dropdown with the selected category 3. Edit again => Value is kept 4. Edit a category to give it specific values for: messaging prefs, password strength/length, can be guarantee 5. Edit the patron, change the category, and confirm that the different limitation are correctly applied. Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- .../prog/en/modules/members/memberentrygen.tt | 8 ++++---- members/memberentry.pl | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) 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 c5f17cb6f0..bdf59c87d3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -20,7 +20,7 @@ Modify patron [% END %] [% INCLUDE 'patron-title.inc' no_html = 1 %] - [% IF categoryname %]([% categoryname | html %])[% END %] + [% IF patron_category %]([% patron_category.description | html %])[% END %] [% END %] › Patrons › Koha </title> <style> @@ -65,8 +65,8 @@ legend:hover { [% ELSE %] <span>Modify patron</span> [% END %] - [% IF categoryname %] - ([% categoryname | html %]) + [% IF patron_category %] + ([% patron_category.description | html %]) [% END %] </a> </li> @@ -118,7 +118,7 @@ legend:hover { <span>Modify patron</span> [% END %] [% INCLUDE 'patron-title.inc' %] - [% IF categoryname %]([% categoryname | html %])[% END %] + [% IF patron_category %]([% patron_category.description | html %])[% END %] </h1> [% IF quickadd && opadd && !check_member %] diff --git a/members/memberentry.pl b/members/memberentry.pl index 23575272aa..f849986a63 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -177,11 +177,11 @@ if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' ) { my $categorycode = $input->param('categorycode') || $borrower_data->{'categorycode'}; my $category_type = $input->param('category_type') || ''; -unless ($category_type or !($categorycode)){ - my $borrowercategory = Koha::Patron::Categories->find($categorycode); - $category_type = $borrowercategory->category_type; - my $category_name = $borrowercategory->description; - $template->param("categoryname"=>$category_name); +my $category; +if ( !$category_type && $categorycode ) { + $category = Koha::Patron::Categories->find($categorycode); + $category_type = $category->category_type; + $template->param( patron_category => $category ); } $category_type="A" unless $category_type; # FIXME we should display a error message instead of a 500 error ! -- 2.20.1