Attachment 71721 Details for Bug 18789 – Bug 18789: Update other occurences where is_child should be used

[patch] Bug 18789: Update other occurences where is_child should be used

Bug-18789-Update-other-occurences-where-ischild-sh.patch (text/plain), 7.85 KB, created by Josef Moravec on 2018-02-16 11:13:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2018-02-16 11:13:02 UTC

Size: 7.85 KB

patch

obsolete

>From 7c71c4ba7289f8a5cde3fd1004f02de7f64bb3db Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 1 Jun 2017 14:03:52 -0300
>Subject: [PATCH] Bug 18789: Update other occurences where is_child should be
> used
>
>Trivial changes here, just do a code review on the QA step
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>---
> members/boraccount.pl      | 2 +-
> members/mancredit.pl       | 2 +-
> members/maninvoice.pl      | 2 +-
> members/member-flags.pl    | 2 +-
> members/member-password.pl | 2 +-
> members/moremember.pl      | 2 +-
> members/printfeercpt.pl    | 4 +---
> members/printinvoice.pl    | 4 +---
> members/readingrec.pl      | 3 +--
> members/routing-lists.pl   | 2 --
> 10 files changed, 9 insertions(+), 16 deletions(-)
>
>diff --git a/members/boraccount.pl b/members/boraccount.pl
>index 8643b90..af35fe8 100755
>--- a/members/boraccount.pl
>+++ b/members/boraccount.pl
>@@ -64,7 +64,7 @@ if ( $action eq 'reverse' ) {
>   ReversePayment( scalar $input->param('accountlines_id') );
> }
> 
>-if ( $patron->category->category_type eq 'C') {
>+if ( $patron->is_child ) {
>     my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
>     $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
>     $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
>diff --git a/members/mancredit.pl b/members/mancredit.pl
>index 9dfd2e6..557f517 100755
>--- a/members/mancredit.pl
>+++ b/members/mancredit.pl
>@@ -79,7 +79,7 @@ if ($add){
>     );
>     my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
>     output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
>-    if ( $patron->category->category_type eq 'C') {
>+    if ( $patron->is_child ) {
>         my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
>         $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
>         $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
>diff --git a/members/maninvoice.pl b/members/maninvoice.pl
>index 68a4850..84ed122 100755
>--- a/members/maninvoice.pl
>+++ b/members/maninvoice.pl
>@@ -107,7 +107,7 @@ if ($add){
>   }
>   $template->param( invoice_types_loop => \@invoice_types );
> 
>-    if ( $patron->category->category_type eq 'C') {
>+    if ( $patron->is_child ) {
>         my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
>         $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
>         $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
>diff --git a/members/member-flags.pl b/members/member-flags.pl
>index 63bb249..2398189 100755
>--- a/members/member-flags.pl
>+++ b/members/member-flags.pl
>@@ -181,7 +181,7 @@ if ($input->param('newflags')) {
>         push @loop, \%row;
>     }
> 
>-    if ( $category_type eq 'C') {
>+    if ( $patron->is_child ) {
>         my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
>         $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
>         $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
>diff --git a/members/member-password.pl b/members/member-password.pl
>index 0e4db74..115f804 100755
>--- a/members/member-password.pl
>+++ b/members/member-password.pl
>@@ -95,7 +95,7 @@ if ( $newpassword and not @errors) {
>     }
> }
> 
>-if ( $category_type eq 'C') {
>+if ( $patron->is_child ) {
>     my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
>     $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
>     $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
>diff --git a/members/moremember.pl b/members/moremember.pl
>index b9c70be..2130228 100755
>--- a/members/moremember.pl
>+++ b/members/moremember.pl
>@@ -167,7 +167,7 @@ if ( $patron->is_debarred ) {
> 
> $data->{ "sex_".$data->{'sex'}."_p" } = 1 if defined $data->{sex};
> 
>-if ( $category_type eq 'C') {
>+if ( $patron->is_child ) {
>     my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
>     $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
>     $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
>diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
>index d6080fb..53e4445 100755
>--- a/members/printfeercpt.pl
>+++ b/members/printfeercpt.pl
>@@ -53,13 +53,11 @@ my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in"
> my $patron         = Koha::Patrons->find( $borrowernumber );
> output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
> 
>-my $category = $patron->category;
>-
> if ( $action eq 'print' ) {
> #  ReversePayment( $borrowernumber, $input->param('accountno') );
> }
> 
>-if ( $category->category_type eq 'C') {
>+if ( $patron->is_child ) {
>     my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
>     $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
>     $template->param( 'catcode' => $patron_categories->next->categorycde )  if $patron_categories->count == 1;
>diff --git a/members/printinvoice.pl b/members/printinvoice.pl
>index 552e0cd..a3ad69b 100755
>--- a/members/printinvoice.pl
>+++ b/members/printinvoice.pl
>@@ -52,9 +52,7 @@ my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in"
> my $patron         = Koha::Patrons->find( $borrowernumber );
> output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
> 
>-my $category = $patron->category;
>-
>-if ( $category->category_type eq 'C' ) {
>+if ( $patron->is_child ) {
>     my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
>     $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
>     $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
>diff --git a/members/readingrec.pl b/members/readingrec.pl
>index 7a63201..015c56c 100755
>--- a/members/readingrec.pl
>+++ b/members/readingrec.pl
>@@ -92,8 +92,7 @@ if ( $op eq 'export_barcodes' ) {
>     }
> }
> 
>-my $category = $patron->category;
>-if ( $category->category_type eq 'C') {
>+if ( $patron->is_child ) {
>     my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
>     $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
>     $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
>diff --git a/members/routing-lists.pl b/members/routing-lists.pl
>index ca150ab..793317d 100755
>--- a/members/routing-lists.pl
>+++ b/members/routing-lists.pl
>@@ -51,8 +51,6 @@ my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in"
> my $patron         = Koha::Patrons->find( $borrowernumber );
> output_and_exit_if_error( $query, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
> 
>-my $category = $patron->category;
>-
> my $count;
> my @borrowerSubscriptions;
> ($count, @borrowerSubscriptions) = GetSubscriptionsFromBorrower($borrowernumber );
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18789: 64211 | 64212 | 64213 | 64214 | 64215 | 64216 | 64218 | 64219 | 64221 | 64229 | 71301 | 71302 | 71303 | 71304 | 71305 | 71306 | 71307 | 71308 | 71309 | 71310 | 71311 | 71485 | 71486 | 71487 | 71488 | 71489 | 71490 | 71491 | 71492 | 71493 | 71494 | 71495 | 71496 | 71679 | 71680 | 71681 | 71682 | 71683 | 71684 | 71685 | 71686 | 71687 | 71688 | 71689 | 71690 | 71691 | 71713 | 71714 | 71715 | 71716 | 71717 | 71718 | 71719 | 71720 | 71721 | 71722 | 71723 | 71724 | 71725 | 71726 | 71727 | 71728 | 71729 | 71730 | 71731 | 71732 | 71733 | 71734 | 71735 | 71736 | 71827 | 71838 | 71841 | 73293 | 73890 | 75237