From 17a43566ada1214fc9d6dbe3e4a891be6505859b Mon Sep 17 00:00:00 2001 From: Pierre-Marc Thibault 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 --- 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 5d778f41e2..a6526c5f20 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 304f4b605d..580ca8ae51 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 @@ -228,7 +228,7 @@ Patrons: - "to access/change superlibrarian privileges." - "
NOTE: A permitted user needs to have the 'permissions' flag (if no superlibrarian)." - - - "These additional following database columns will be transferred from guarantor to guarantee:" + - "These additional following database columns 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 5efd47ec4e..a01a0b4e9f 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -123,8 +123,6 @@ my $count = scalar @guarantees; if ( $count ) { $template->param( isguarantee => 1 ); - my @guaranteedata; - my $amount; my $totalmount = 0; foreach my $guarantee (@guarantees){ -- 2.11.0