Commit 2799e118 authored by Dave Lawrence's avatar Dave Lawrence

Bug 916979 - Bug.search ignores the "limit" parameter

a/r=glob
parent 4ab99774
...@@ -270,10 +270,6 @@ use constant FIELD_MAP => { ...@@ -270,10 +270,6 @@ use constant FIELD_MAP => {
summary => 'short_desc', summary => 'short_desc',
url => 'bug_file_loc', url => 'bug_file_loc',
whiteboard => 'status_whiteboard', whiteboard => 'status_whiteboard',
# These are special values for the WebService Bug.search method.
limit => 'LIMIT',
offset => 'OFFSET',
}; };
use constant REQUIRED_FIELD_MAP => { use constant REQUIRED_FIELD_MAP => {
......
...@@ -493,19 +493,19 @@ sub search { ...@@ -493,19 +493,19 @@ sub search {
} }
my %match_params = %{ $params }; my %match_params = %{ $params };
delete $params->{include_fields}; delete $match_params{include_fields};
delete $params->{exclude_fields}; delete $match_params{exclude_fields};
# If no other parameters have been passed other than limit and offset # If no other parameters have been passed other than limit and offset
# then we throw error if system is configured to do so. # then we throw error if system is configured to do so.
if (!grep(!/^(limit|offset)$/i, keys %$params) if (!grep(!/^(limit|offset)$/, keys %match_params)
&& !Bugzilla->params->{search_allow_no_criteria}) && !Bugzilla->params->{search_allow_no_criteria})
{ {
ThrowUserError('buglist_parameters_required'); ThrowUserError('buglist_parameters_required');
} }
$options{order_columns} = [ split(/\s*,\s*/, delete $params->{order}) ] if $params->{order}; $options{order_columns} = [ split(/\s*,\s*/, delete $match_params{order}) ] if $match_params{order};
$options{params} = $params; $options{params} = \%match_params;
my $search = new Bugzilla::Search(%options); my $search = new Bugzilla::Search(%options);
my ($data) = $search->data; my ($data) = $search->data;
...@@ -518,7 +518,7 @@ sub search { ...@@ -518,7 +518,7 @@ sub search {
my @bug_ids = map { $_->[0] } @$data; my @bug_ids = map { $_->[0] } @$data;
my $bug_objects = Bugzilla::Bug->new_from_list(\@bug_ids); my $bug_objects = Bugzilla::Bug->new_from_list(\@bug_ids);
my @bugs = map { $self->_bug_to_hash($_, \%match_params) } @$bug_objects; my @bugs = map { $self->_bug_to_hash($_, $params) } @$bug_objects;
return { bugs => \@bugs }; return { bugs => \@bugs };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment