Attachment #34171 for bug #13189

View | Details | Raw Unified | Return to bug 13189
Collapse All | Expand All

Lines 203-209 sub _express_member_find { Link Here

(-)a/C4/Members.pm (-2 / +2 lines)
203	}	203	}
204		204
205	sub Search {	205	sub Search {
206	my ( $filter, $orderby, $limit, $columns_out, $search_on_fields, $searchtype ) = @_;	206	my ( $filter, $orderby, $limit, $columns_out, $search_on_fields, $searchtype, $not_attributes ) = @_;
207		207
208	my $search_string;	208	my $search_string;
209	my $found_borrower;	209	my $found_borrower;
Lines 237-243 sub Search { Link Here
237	}	237	}
238	}	238	}
239		239
240	if ( !$found_borrower && C4::Context->preference('ExtendedPatronAttributes') && $search_string ) {	240	if ( !$found_borrower && C4::Context->preference('ExtendedPatronAttributes') && $search_string && !$not_attributes ) {
241	my $matching_records = C4::Members::Attributes::SearchIdMatchingAttribute($search_string);	241	my $matching_records = C4::Members::Attributes::SearchIdMatchingAttribute($search_string);
242	if(scalar(@$matching_records)>0) {	242	if(scalar(@$matching_records)>0) {
243	if ( my $fr = ref $filter ) {	243	if ( my $fr = ref $filter ) {

Lines 50-56 function add_item(borrowernum,batch_id,type_id){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt (-1 / +1 lines)
50	<div class="browse">	50	<div class="browse">
51	Browse by last name:	51	Browse by last name:
52	[% FOREACH letter IN alphabet.split(' ') %]	52	[% FOREACH letter IN alphabet.split(' ') %]
53	<a href="/cgi-bin/koha/patroncards/members-search.pl?member=[% letter %]&batch_id=[% batch_id %]">[% letter %]</a>	53	<a href="/cgi-bin/koha/patroncards/members-search.pl?not_attributes=1&member=[% letter %]&batch_id=[% batch_id %]">[% letter %]</a>
54	[% END %]	54	[% END %]
55	</div>	55	</div>
56		56




my $category = $cgi->param('category') || undef;
my $member = $cgi->param('member') || '';
my $orderby = $cgi->param('orderby') || undef;
my $not_attributes = $cgi->param('not_attributes') || undef;

my @categories=C4::Category->all;
my %categories_display;

$member =~ s/\*/%/g;

if ($member || $category) {
    my $results = $category ? Search({''=>$member, categorycode=>$category}, $orderby, undef, undef, undef, undef, $not_attributes )
                            : Search($member, $orderby, undef, undef, undef, undef, $not_attributes);
    my $count = $results ? @$results : 0;

    my @resultsdata = ();
- 

Return to bug 13189

Lines 35-40 my $resultsperpage = $cgi->param('resultsperpage')\|\|C4::Context->preference("Pat Link Here

(-)a/patroncards/members-search.pl (-3 / +3 lines)
35	my $category = $cgi->param('category') \|\| undef;	35	my $category = $cgi->param('category') \|\| undef;
36	my $member = $cgi->param('member') \|\| '';	36	my $member = $cgi->param('member') \|\| '';
37	my $orderby = $cgi->param('orderby') \|\| undef;	37	my $orderby = $cgi->param('orderby') \|\| undef;
		38	my $not_attributes = $cgi->param('not_attributes') \|\| undef;
38		39
39	my @categories=C4::Category->all;	40	my @categories=C4::Category->all;
40	my %categories_display;	41	my %categories_display;
Lines 72-79 $member =~ s/,//g; #remove any commas from search string Link Here
72	$member =~ s/\*/%/g;	73	$member =~ s/\*/%/g;
73		74
74	if ($member \|\| $category) {	75	if ($member \|\| $category) {
75	my $results = $category ? Search({''=>$member, categorycode=>$category}, $orderby)	76	my $results = $category ? Search({''=>$member, categorycode=>$category}, $orderby, undef, undef, undef, undef, $not_attributes )
76	: Search($member, $orderby);	77	: Search($member, $orderby, undef, undef, undef, undef, $not_attributes);
77	my $count = $results ? @$results : 0;	78	my $count = $results ? @$results : 0;
78		79
79	my @resultsdata = ();	80	my @resultsdata = ();
80	-