From cb580aa60bc9e91777d644ce2110da4f8ab552d6 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 1 Jun 2022 10:28:20 +0200 Subject: [PATCH] Bug 30874: Remove category_type Content-Type: text/plain; charset=utf-8 In which case do we pass category_type to this script? Am I missing something? Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Marcel de Rooy --- .../prog/en/modules/members/memberentrygen.tt | 15 +++++++-------- members/memberentry.pl | 19 ++++--------------- 2 files changed, 11 insertions(+), 23 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 fa3b4b88dd..9eb5f1605a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -242,7 +242,6 @@ legend:hover { [% END %] - @@ -269,9 +268,9 @@ legend:hover { [% IF ( step_1 ) %] [% UNLESS notitle && nosurname && nofirstname && nomiddle_name && nodateofbirth && noinitials && noothernames &&nosex %]
- [% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity + [% IF ( patron_category.category_type == 'I' ) %]Organization [% ELSE %]Patron [% END %]identity
    - [% UNLESS ( I ) %] + [% UNLESS ( patron_category.category_type == 'I' ) %] [% UNLESS notitle %] [% IF Koha.Preference('BorrowersTitles') %]
  1. @@ -301,7 +300,7 @@ legend:hover { [% UNLESS nosurname %]
  2. - [% IF ( I ) %] + [% IF ( patron_category.category_type == 'I' ) %] @@ -325,7 +324,7 @@ legend:hover {
    3. [% END # /UNLESS nosurname %] - [% UNLESS ( I ) %] + [% UNLESS ( patron_category.category_type == 'I' ) %] [% UNLESS nofirstname %]
  3. [% IF ( mandatoryfirstname ) %] @@ -404,11 +403,11 @@ legend:hover { [% IF ( mandatoryothernames ) %] Required [% END %] - [% IF ( I ) %][% END %] + [% IF ( patron_category.category_type == 'I' ) %][% END %]
    4. [% END #/UNLESS noothernames %] - [% UNLESS ( I ) %] + [% UNLESS ( patron_category.category_type == 'I' ) %] [% UNLESS nosex %]
  4. [% UNLESS ( opduplicate ) %] @@ -455,7 +454,7 @@ legend:hover { [% FOREACH r IN relationships %]
      - [% IF category_type == 'I' %] + [% IF patron_category.category_type == 'I' %]
    1. Organization: [% INCLUDE 'patron-title.inc' patron=r.guarantor hide_patron_infos_if_needed=1 %] diff --git a/members/memberentry.pl b/members/memberentry.pl index 7703edfa08..ee44ea6874 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -172,17 +172,10 @@ if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' ) { } $borrower_data = $patron->unblessed; - $borrower_data->{category_type} = $patron->category->category_type; } my $categorycode = $input->param('categorycode') || $borrower_data->{'categorycode'}; -my $category_type = $input->param('category_type') || ''; - my $category = Koha::Patron::Categories->find($categorycode); -$category_type ||= $category && $category->category_type; - -$category_type="A" unless $category_type; # FIXME we should display a error message instead of a 500 error ! - $template->param( patron_category => $category ); # if a add or modify is requested => check validity of data. @@ -212,7 +205,7 @@ if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' ) } # check permission to modify login info. - if (ref($borrower_data) && ($borrower_data->{'category_type'} eq 'S') && ! (C4::Auth::haspermission($userenv->{'id'},{'staffaccess'=>1})) ) { + if (ref($borrower_data) && ($category->category_type eq 'S') && ! (C4::Auth::haspermission($userenv->{'id'},{'staffaccess'=>1})) ) { $NoUpdateLogin = 1; } } @@ -222,7 +215,6 @@ if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' ) my @keys_to_delete = ( qr/^(borrowernumber|date_renewed|debarred|debarredcomment|flags|privacy|updated_on|lastseen|login_attempts|overdrive_auth_token|anonymized)$/, # Bug 28935 qr/^BorrowerMandatoryField$/, - qr/^category_type$/, qr/^check_member$/, qr/^destination$/, qr/^nodouble$/, @@ -297,14 +289,14 @@ $newdata{'lang'} = $input->param('lang') if defined($input->param('lang')) if ( ( defined $newdata{'userid'} && $newdata{'userid'} eq '' ) || $check_BorrowerUnwantedField =~ /userid/ && !defined $data{'userid'} ) { my $fake_patron = Koha::Patron->new; $fake_patron->userid($patron->userid) if $patron; # editing - if ( ( defined $newdata{'firstname'} || $category_type eq 'I' ) && ( defined $newdata{'surname'} ) ) { + if ( ( defined $newdata{'firstname'} || $category->category_type eq 'I' ) && ( defined $newdata{'surname'} ) ) { # Full page edit, firstname and surname input zones are present $fake_patron->firstname($newdata{firstname}); $fake_patron->surname($newdata{surname}); $fake_patron->generate_userid; $newdata{'userid'} = $fake_patron->userid; } - elsif ( ( defined $data{'firstname'} || $category_type eq 'I' ) && ( defined $data{'surname'} ) ) { + elsif ( ( defined $data{'firstname'} || $category->category_type eq 'I' ) && ( defined $data{'surname'} ) ) { # Partial page edit (access through "Details"/"Library details" tab), firstname and surname input zones are not used # Still, if the userid field is erased, we can create a new userid with available firstname and surname # FIXME clean thiscode newdata vs data is very confusing @@ -738,7 +730,7 @@ if (C4::Context->userenv && C4::Context->userenv->{'branch'}) { $userbranch = C4::Context->userenv->{'branch'}; } -if (defined ($data{'branchcode'}) and ( $op eq 'modify' || $op eq 'duplicate' || ( $op eq 'add' && $category_type eq 'C' ) )) { +if (defined ($data{'branchcode'}) and ( $op eq 'modify' || $op eq 'duplicate' || ( $op eq 'add' && $category->category_type eq 'C' ) )) { $userbranch = $data{'branchcode'}; } $template->param( userbranch => $userbranch ); @@ -809,8 +801,6 @@ $template->param( step => $step ) if $step; # associate with step to know wh $template->param( BorrowerMandatoryField => C4::Context->preference("BorrowerMandatoryField"),#field to test with javascript - category_type => $category_type,#to know the category type of the borrower - "$category_type" => 1,# associate with step to know where u are destination => $destination,#to know where u come from and where u must go in redirect check_member => $check_member,#to know if the borrower already exist(=>1) or not (=>0) "op$op" => 1); @@ -822,7 +812,6 @@ $template->param( relshiploop => \@relshipdata, btitle=> $default_borrowertitle, flagloop => \@flagdata, - category_type =>$category_type, modify => $modify, nok => $nok,#flag to know if an error NoUpdateLogin => $NoUpdateLogin, -- 2.20.1