From d544a31ded7d9c0897883e4d15f4959fcbfaa7e8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 8 Apr 2015 13:29:28 +0200 Subject: [PATCH] Bug 9314: Remove useless code related to the type_only parameter Since the pref AddPatronLists has been removed in bug 13497, the code related to type_only and category_type in memberentry.pl is useless. Test plan: Confirm you don't the information message. You can also confirm that the message was wrong and nothing was saved. --- koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 3 --- members/memberentry.pl | 6 +----- 2 files changed, 1 insertion(+), 8 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 8412c90..98a9069 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -1398,9 +1398,6 @@ [% END %] - [% IF type_only %] -

If no preferences are selected, the default preferences for the category chosen will be applied on save, otherwise your selection here is saved

- [% END %] [% INCLUDE 'messaging-preference-form.inc' %] [% IF ( SMSSendDriver ) %]

diff --git a/members/memberentry.pl b/members/memberentry.pl index 4638508..8ad3f4e 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -150,16 +150,12 @@ $template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 ); ( $borrower_data = GetMember( 'borrowernumber' => $borrowernumber ) ) 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') || ''; -if ($category_type){ - $template->{VARS}->{'type_only'} = 1; -} -my $new_c_type = $category_type; #if we have input param, then we've already chosen the cat_type. unless ($category_type or !($categorycode)){ my $borrowercategory = GetBorrowercategory($categorycode); $category_type = $borrowercategory->{'category_type'}; my $category_name = $borrowercategory->{'description'}; $template->param("categoryname"=>$category_name); - } +} $category_type="A" unless $category_type; # FIXME we should display a error message instead of a 500 error ! # if a add or modify is requested => check validity of data. -- 2.1.0