Attachment 142439 Details for Bug 12446 – Bug 12446: Merge conflit resolve and add missing var

[patch] Bug 12446: Merge conflit resolve and add missing var

Bug-12446-Merge-conflit-resolve-and-add-missing-va.patch (text/plain), 1.87 KB, created by geraud.frappier on 2022-10-21 18:04:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: geraud.frappier

Created: 2022-10-21 18:04:39 UTC

Size: 1.87 KB

patch

obsolete

>From ff42d0805b72c2991ec855cd1c907898f9d03955 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?G=C3=A9raud=20Frappier?= <geraud.frappier@inlibro.com>
>Date: Fri, 21 Oct 2022 13:56:16 -0400
>Subject: [PATCH] Bug 12446: Merge conflit resolve and add missing var
>
>This patch resolve merge conflit and add the instantiation of the variable "my $categories" that was missing in memberentry.pl.
>---
> members/memberentry.pl | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
>diff --git a/members/memberentry.pl b/members/memberentry.pl
>index 0a85c91c21..a8fee5a4fd 100755
>--- a/members/memberentry.pl
>+++ b/members/memberentry.pl
>@@ -651,13 +651,14 @@ if(!defined($data{'sex'})){
> 
> my @typeloop;
> my $no_categories = 1;
>-my $no_add;
>+
> foreach my $category_type (qw(C A S P I X)) {
>     my $categories_limits = { category_type => $category_type };
>     $categories_limits->{canbeguarantee} = 1 if ($guarantor_id);
>     my $patron_categories = Koha::Patron::Categories->search_with_library_limits( $categories_limits, {order_by => ['categorycode']} );
>     $no_categories = 0 if $patron_categories->count > 0;
>-
>+}
>+my $categories;
> $template->param(
>     patron_categories => $categories,
>     no_categories => $no_categories,
>@@ -757,9 +758,7 @@ $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
>+  destination   => $destination,#to know wheree u come from and wheree u must go in redirect
>   check_member    => $check_member,#to know if the borrower already exist(=>1) or not (=>0) 
>   "op$op"   => 1);
> 
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 12446: 29278 | 36176 | 39744 | 42469 | 42470 | 42535 | 46277 | 46278 | 46327 | 46328 | 46345 | 46486 | 49793 | 50953 | 53534 | 53535 | 53536 | 53913 | 60929 | 60930 | 60934 | 63148 | 63149 | 63214 | 64793 | 64794 | 64828 | 72295 | 72883 | 77766 | 77767 | 77768 | 79343 | 79344 | 79345 | 79347 | 79348 | 85069 | 88364 | 88365 | 88366 | 88367 | 90389 | 90390 | 90391 | 90392 | 90470 | 90471 | 90472 | 90473 | 93388 | 93389 | 93390 | 93391 | 93392 | 93393 | 93394 | 95411 | 95853 | 95854 | 95855 | 95856 | 95857 | 95858 | 95859 | 95860 | 106753 | 106754 | 106755 | 106756 | 106757 | 107611 | 111052 | 111053 | 111317 | 111318 | 112102 | 112160 | 112161 | 112162 | 112163 | 113583 | 121925 | 121926 | 121927 | 121928 | 121929 | 122084 | 122085 | 122086 | 122087 | 122088 | 122089 | 122090 | 122091 | 122184 | 122185 | 122186 | 122187 | 130398 | 130399 | 130400 | 130401 | 130402 | 131965 | 131966 | 131967 | 131968 | 131969 | 133691 | 133952 | 133953 | 133954 | 133955 | 133956 | 133957 | 134930 | 134931 | 134932 | 134933 | 134934 | 134935 | 134936 | 135506 | 135507 | 135508 | 135509 | 135510 | 135511 | 135512 | 135519 | 135520 | 135521 | 135522 | 135523 | 135544 | 135545 | 142401 | 142408 | 142431 | 142432 | 142433 | 142434 | 142435 | 142436 | 142437 | 142438 | 142439