Attachment 95856 Details for Bug 12446 – Bug 12446: (QA follow-up) QA tests fixing, cleaning code

[patch] Bug 12446: (QA follow-up) QA tests fixing, cleaning code

Bug-12446-QA-follow-up-QA-tests-fixing-cleaning-co.patch (text/plain), 3.00 KB, created by Maryse Simard on 2019-11-27 16:19:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maryse Simard

Created: 2019-11-27 16:19:10 UTC

Size: 3.00 KB

patch

obsolete

>From 72b4212d95c5e3a017b911eeca5b84be33d98e75 Mon Sep 17 00:00:00 2001
>From: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
>Date: Fri, 5 Apr 2019 16:50:41 -0400
>Subject: [PATCH] Bug 12446: (QA follow-up) QA tests fixing, cleaning code
>
>This patch does 3 things :
>- Remove old code in C4/Utils/DataTables/Members.pm.
>- Fix the AdditionalGuarantorField dead link for the borrowers table schema.
>- Remove unused variables so QA tests pass.
>
>Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>
>---
> C4/Utils/DataTables/Members.pm                                    | 8 --------
> .../intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref  | 2 +-
> members/moremember.pl                                             | 2 --
> 3 files changed, 1 insertion(+), 11 deletions(-)
>
>diff --git a/C4/Utils/DataTables/Members.pm b/C4/Utils/DataTables/Members.pm
>index 5d778f4..a6526c5 100644
>--- a/C4/Utils/DataTables/Members.pm
>+++ b/C4/Utils/DataTables/Members.pm
>@@ -58,14 +58,6 @@ sub search {
>         }
>     }
> 
>-    # If branches are independent and user is not superlibrarian
>-    # The search has to be only on the user branch
>-    if ( C4::Context::only_my_library ) {
>-        my $userenv = C4::Context->userenv;
>-        $branchcode = $userenv->{'branch'};
>-
>-    }
>-
>     $dbh = C4::Context->dbh;
>     my @columns = qw( borrowernumber surname firstname streetnumber streettype address address2 city state zipcode country cardnumber dateexpiry borrowernotes branchcode email userid dateofbirth categorycode phone phonepro mobile fax email emailpro);
>     if( my @guarantor_attributes = @{ get_guarantor_shared_attributes() }){
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>index bba940b..42ab3d6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>@@ -234,7 +234,7 @@ Patrons:
>          - "to access/change superlibrarian privileges."
>          - "<br><strong>NOTE:</strong> A permitted user needs to have the 'permissions' flag (if no superlibrarian)."
>      -
>-         - "These additional following <a href='http://schema.koha-community.org/tables/borrowers.html' target='blank'>database columns</a> will be transferred from guarantor to guarantee:"
>+         - "These additional following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> will be transferred from guarantor to guarantee:"
>          - pref: AdditionalGuarantorField
>            class: multi
>          - (separate columns with |)
>diff --git a/members/moremember.pl b/members/moremember.pl
>index 68c56aa..5ffd06f 100755
>--- a/members/moremember.pl
>+++ b/members/moremember.pl
>@@ -120,8 +120,6 @@ my $count = scalar @guarantees;
> if ( $count ) {
>     $template->param( isguarantee => 1 );
> 
>-    my @guaranteedata;
>-    my $amount;
>     my $totalmount = 0;
> 
>     foreach my $guarantee (@guarantees){
>-- 
>2.7.4

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