X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fmember.pl;h=f8aa4f1a72419a058ac2295ea83d32277d798d10;hb=802dd7baf5a51e4bf028a070497c72cf894c9527;hp=f66b851cb20b834e9ad15079f7c6116c9a8e799c;hpb=63541e4223224831e4eb2bb51d108cc4a2155388;p=koha.git diff --git a/members/member.pl b/members/member.pl index f66b851cb2..f8aa4f1a72 100755 --- a/members/member.pl +++ b/members/member.pl @@ -58,7 +58,8 @@ my $branches = GetBranches; my @branchloop; foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) { - my $selected = 1 if $branches->{$_}->{branchcode} eq $$patron{branchcode}; + my $selected; + $selected = 1 if $branches->{$_}->{branchcode} eq $$patron{branchcode}; my %row = ( value => $_, selected => $selected, branchname => $branches->{$_}->{branchname}, @@ -75,10 +76,11 @@ foreach my $category (@categories){ }; $categories_dislay{$$category{categorycode}} = $hash; } +my $AddPatronLists = C4::Context->preference("AddPatronLists") || ''; $template->param( - "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1", + "AddPatronLists_$AddPatronLists" => "1", ); -if (C4::Context->preference("AddPatronLists")=~/code/){ +if ($AddPatronLists=~/code/){ $categories[0]->{'first'}=1; } @@ -93,20 +95,21 @@ else { @orderby = ({surname=>0},{firstname=>0}); } +my $searchfields = $input->param('searchfields'); +my @searchfields = $searchfields ? split( ',', $searchfields ) : ( "firstname", "surname", "othernames", "cardnumber", "userid", "email" ); + $member =~ s/,//g; #remove any commas from search string $member =~ s/\*/%/g; -my ($count,$results); - -my @searchpatron; -push @searchpatron, $member if ($member); -push @searchpatron, $patron if ( keys %$patron ); my $from = ( $startfrom - 1 ) * $resultsperpage; my $to = $from + $resultsperpage; -#($results)=Search(\@searchpatron,{surname=>1,firstname=>1},[$from,$to],undef,["firstname","surname","email","othernames"] ) if (@searchpatron); -my $search_scope = ( $quicksearch ? "field_start_with" : "start_with" ); -($results) = Search( \@searchpatron, \@orderby, undef, undef, [ "firstname", "surname", "othernames", "cardnumber", "userid" ], $search_scope ) if (@searchpatron); +my ($count,$results); +if ($member || keys %$patron) { + #($results)=Search($member || $patron,{surname=>1,firstname=>1},[$from,$to],undef,["firstname","surname","email","othernames"] ); + my $search_scope = ( $quicksearch ? "field_start_with" : "start_with" ); + ($results) = Search( $member || $patron, \@orderby, undef, undef, \@searchfields, $search_scope ); +} if ($results) { for my $field ('categorycode','branchcode'){ @@ -115,6 +118,12 @@ if ($results) { } $count = scalar(@$results); } + +if($count == 1){ + print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=" . @$results[0]->{borrowernumber}); + exit; +} + my @resultsdata; $to=($count>$to?$to:$count); my $index=$from; @@ -132,6 +141,7 @@ foreach my $borrower(@$results[$from..$to-1]){ issues => $issue, odissue => "$od/$issue", fines => sprintf("%.2f",$fines), + branchname => $branches->{$borrower->{branchcode}}->{branchname}, ); push(@resultsdata, \%row); } @@ -165,7 +175,7 @@ $template->param( startfrom => $startfrom, from => ($startfrom-1)*$resultsperpage+1, to => $to, - multipage => ($count != $to+1 || $startfrom!=1), + multipage => ($count != $to || $startfrom!=1), advsearch => ($$patron{categorycode} || $$patron{branchcode}), branchloop=>\@branchloop, categories=>\@categories,