Bugzilla – Attachment 3139 Details for
Bug 5749
The display of borrower adresses composed of streetnumber, streettype and address is broken
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Followup patch
0002-Bug-5749-follow-up-patch-whitespace-cleanup.patch (text/plain), 5.74 KB, created by
Chris Cormack
on 2011-02-13 22:26:08 UTC
(
hide
)
Description:
Followup patch
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2011-02-13 22:26:08 UTC
Size:
5.74 KB
patch
obsolete
>From b216778b5b2c665d16441db473e9905a5227d55f Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Mon, 14 Feb 2011 11:21:59 +1300 >Subject: [PATCH] Bug 5749 follow up patch, whitespace cleanup > >--- > C4/Members.pm | 64 ++++++++++++++++++++++++++++---------------------------- > 1 files changed, 32 insertions(+), 32 deletions(-) > >diff --git a/C4/Members.pm b/C4/Members.pm >index 5780e01..ce191c5 100644 >--- a/C4/Members.pm >+++ b/C4/Members.pm >@@ -42,26 +42,26 @@ BEGIN { > #Get data > push @EXPORT, qw( > &Search >- &SearchMember >+ &SearchMember > &GetMemberDetails > &GetMember > >- &GetGuarantees >+ &GetGuarantees > > &GetMemberIssuesAndFines > &GetPendingIssues > &GetAllIssues > >- &get_institutions >- &getzipnamecity >+ &get_institutions >+ &getzipnamecity > &getidcity > > &GetFirstValidEmailAddress > >- &GetAge >- &GetCities >- &GetRoadTypes >- &GetRoadTypeDetails >+ &GetAge >+ &GetCities >+ &GetRoadTypes >+ &GetRoadTypeDetails > &GetSortDetails > &GetTitles > >@@ -73,7 +73,7 @@ BEGIN { > &GetMemberAccountRecords > &GetBorNotifyAcctRecord > >- &GetborCatFromCatType >+ &GetborCatFromCatType > &GetBorrowercategory > &GetBorrowercategoryList > >@@ -176,7 +176,7 @@ sub SearchMember { > my $count; > my @data; > my @bind = (); >- >+ > # this is used by circulation everytime a new borrowers cardnumber is scanned > # so we can check an exact match first, if that works return, otherwise do the rest > $query = "SELECT * FROM borrowers >@@ -209,8 +209,8 @@ sub SearchMember { > if (C4::Context->preference("IndependantBranches") && !$showallbranches){ > if (C4::Context->userenv && C4::Context->userenv->{flags} % 2 !=1 && C4::Context->userenv->{'branch'}){ > $query.=" borrowers.branchcode =".$dbh->quote(C4::Context->userenv->{'branch'})." AND " unless (C4::Context->userenv->{'branch'} eq "insecure"); >- } >- } >+ } >+ } > $query.="((surname LIKE ? OR surname LIKE ? > OR firstname LIKE ? OR firstname LIKE ? > OR othernames LIKE ? OR othernames LIKE ?) >@@ -746,10 +746,10 @@ sub AddMember { > my $dbh = C4::Context->dbh; > $data{'password'} = '!' if (not $data{'password'} and $data{'userid'}); > $data{'password'} = md5_base64( $data{'password'} ) if $data{'password'}; >- $data{'borrowernumber'}=InsertInTable("borrowers",\%data); >- # mysql_insertid is probably bad. not necessarily accurate and mysql-specific at best. >+ $data{'borrowernumber'}=InsertInTable("borrowers",\%data); >+ # mysql_insertid is probably bad. not necessarily accurate and mysql-specific at best. > logaction("MEMBERS", "CREATE", $data{'borrowernumber'}, "") if C4::Context->preference("BorrowersLog"); >- >+ > # check for enrollment fee & add it if needed > my $sth = $dbh->prepare("SELECT enrolmentfee FROM categories WHERE categorycode=?"); > $sth->execute($data{'categorycode'}); >@@ -817,9 +817,9 @@ sub changepassword { > $sth->execute( $uid, $digest, $member ); > $resultcode=1; > } >- >+ > logaction("MEMBERS", "CHANGE PASS", $member, "") if C4::Context->preference("BorrowersLog"); >- return $resultcode; >+ return $resultcode; > } > > >@@ -894,7 +894,7 @@ sub fixup_cardnumber ($) { > my ($result) = $sth->fetchrow; > return $result + 1; > } >- return $cardnumber; # just here as a fallback/reminder >+ return $cardnumber; # just here as a fallback/reminder > } > > =head2 GetGuarantees >@@ -931,7 +931,7 @@ sub GetGuarantees { > =head2 UpdateGuarantees > > &UpdateGuarantees($parent_borrno); >- >+ > > C<&UpdateGuarantees> borrower data for an adult and updates all the guarantees > with the modified information >@@ -1209,7 +1209,7 @@ sub checkcardnumber { > else { > return 0; > } >-} >+} > > > =head2 getzipnamecity (OUEST-PROVENCE) >@@ -1388,8 +1388,8 @@ sub GetBorrowercategory { > my $data = > $sth->fetchrow_hashref; > return $data; >- } >- return; >+ } >+ return; > } # sub getborrowercategory > > =head2 GetBorrowercategoryList >@@ -1646,20 +1646,20 @@ sub DelMember { > > =head2 SetMemberInfosInTemplate > &SetMemberInfosInTemplate($borrowernumber, $template) >- >- >+ >+ > Settings borrower informations for template user > > =cut > > sub SetMemberInfosInTemplate { > my ($borrowernumber, $template) = @_; >- >+ > my $borrower = GetMemberDetails( $borrowernumber, 0 ); > foreach my $key (keys %$borrower){ > $template->param($key => $borrower->{$key}); > } >- >+ > # Computes full borrower address > my (undef, $roadttype_hashref) = &GetRoadTypes(); > my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'}; >@@ -1667,7 +1667,7 @@ sub SetMemberInfosInTemplate { > address => $address, > branchname => GetBranchName($borrower->{'branchcode'}), > ); >- >+ > foreach (qw(dateenrolled dateexpiry dateofbirth)) { > my $userdate = $borrower->{$_}; > unless ($userdate) { >@@ -1678,7 +1678,7 @@ sub SetMemberInfosInTemplate { > $borrower->{$_} = $userdate || ''; > $template->param( $_ => $userdate ); > } >- >+ > my $attributes = GetBorrowerAttributes($borrowernumber); > $template->param( > extendedattributes => $attributes, >@@ -1923,13 +1923,13 @@ sub GetBorrowersWhoHaveNotBorrowedSince { > } > warn $query if $debug; > my $sth = $dbh->prepare($query); >- if (scalar(@query_params)>0){ >+ if (scalar(@query_params)>0){ > $sth->execute(@query_params); >- } >+ } > else { > $sth->execute; >- } >- >+ } >+ > my @results; > while ( my $data = $sth->fetchrow_hashref ) { > push @results, $data; >-- >1.7.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5749
:
3138
|
3139
|
4843
|
8034
|
8126