summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2013-09-18 17:24:17 +0200
committerDave Lawrence <dlawrence@mozilla.com>2013-09-18 17:24:17 +0200
commit898a95843f1fcb1982c409adaeb0d9b8f6f23a32 (patch)
tree88626521663c1b22e266eeb8adfe8425e7a402d4 /Bugzilla
parent7b756e036dfdf54368d5e7e18dd1cefd53724c12 (diff)
downloadbugzilla-898a95843f1fcb1982c409adaeb0d9b8f6f23a32.tar.gz
bugzilla-898a95843f1fcb1982c409adaeb0d9b8f6f23a32.tar.xz
Bug 916979 - Bug.search ignores the "limit" parameter
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Bug.pm4
-rw-r--r--Bugzilla/WebService/Bug.pm12
2 files changed, 6 insertions, 10 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 9446333d7..6f3107d5c 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -286,10 +286,6 @@ use constant FIELD_MAP => {
summary => 'short_desc',
url => 'bug_file_loc',
whiteboard => 'status_whiteboard',
-
- # These are special values for the WebService Bug.search method.
- limit => 'LIMIT',
- offset => 'OFFSET',
};
use constant REQUIRED_FIELD_MAP => {
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 8344a2eba..0d78dbb28 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -507,19 +507,19 @@ sub search {
}
my %match_params = %{ $params };
- delete $params->{include_fields};
- delete $params->{exclude_fields};
+ delete $match_params{include_fields};
+ delete $match_params{exclude_fields};
# If no other parameters have been passed other than limit and offset
# 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})
{
ThrowUserError('buglist_parameters_required');
}
- $options{order_columns} = [ split(/\s*,\s*/, delete $params->{order}) ] if $params->{order};
- $options{params} = $params;
+ $options{order_columns} = [ split(/\s*,\s*/, delete $match_params{order}) ] if $match_params{order};
+ $options{params} = \%match_params;
my $search = new Bugzilla::Search(%options);
my ($data) = $search->data;
@@ -532,7 +532,7 @@ sub search {
my @bug_ids = map { $_->[0] } @$data;
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 };
}