Attachment 39957 Details for Bug 9314 – [PASSED QA] Bug 9314: Remove useless code related to the type_only parameter

[patch] [PASSED QA] Bug 9314: Remove useless code related to the type_only parameter

PASSED-QA-Bug-9314-Remove-useless-code-related-to-.patch (text/plain), 2.83 KB, created by Katrin Fischer on 2015-06-07 14:38:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2015-06-07 14:38:52 UTC

Size: 2.83 KB

patch

obsolete

>From b9eb8b3fb2b5633de6ecd3c7529a326452c75b15 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Wed, 8 Apr 2015 13:29:28 +0200
>Subject: [PATCH] [PASSED QA] 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.
>
>Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
>Dead code removed, no errors
>
>Think that bug description can be updated to commit message
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> 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 82025f6..1296a9c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -1066,9 +1066,6 @@
>     </script>
>     [% END %]
>     <input type="hidden" name="setting_messaging_prefs" value="1" />
>-    [% IF type_only %]
>-        <p>If no preferences are selected, the default preferences for the category chosen will be applied on save, otherwise your selection here is saved</p>
>-    [% END %]
>     [% INCLUDE 'messaging-preference-form.inc' %]
>     [% IF ( SMSSendDriver ) %]
>         <p><label for="SMSnumber">SMS number:</label>
>diff --git a/members/memberentry.pl b/members/memberentry.pl
>index 967ebd1..8beecec 100755
>--- a/members/memberentry.pl
>+++ b/members/memberentry.pl
>@@ -148,16 +148,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.
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 9314: 37577 | 39314 | 39957