vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug 40933: 

Remove duplicate code (move LookupNamedQuery to Bugzilla::Search),
Add search tests "matched by named query" and "not matched by named query"


git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@101 6955db30-a419-402b-8a0d-67ecbb4d7f56
custis
vfilippov 2009-01-16 15:10:19 +00:00
parent 2973155fe7
commit 88017cefaf
4 changed files with 132 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
Bugzilla/Search.pm
View File

@ -508,6 +508,8 @@ sub init {
",(changedbefore|changedafter)" => \&_changedbefore_changedafter,
",(changedfrom|changedto)" => \&_changedfrom_changedto,
",changedby" => \&_changedby,
",insearch" => \&_in_search_results,
",notinsearch" => \&_not_in_search_results,
);
my @funcnames;
while (@funcdefs) {
@ -2046,23 +2048,128 @@ sub _changedfrom_changedto {
$$term = "($table.bug_when IS NOT NULL)";
}
sub _changedby {
sub _changedby
{
my $self = shift;
my %func_args = @_;
my ($chartid, $chartfields, $f, $v, $supptables, $term) =
@func_args{qw(chartid chartfields f v supptables term)};
my $table = "act_$$chartid";
my $fieldid = $$chartfields{$$f};
if (!$fieldid) {
if (!$fieldid)
{
ThrowCodeError("invalid_field_name", {field => $$f});
}
my $id = login_to_id($$v, THROW_ERROR);
push(@$supptables, "LEFT JOIN bugs_activity AS $table " .
"ON $table.bug_id = bugs.bug_id " .
"AND $table.fieldid = $fieldid " .
"AND $table.who = $id");
push @$supptables, "LEFT JOIN bugs_activity AS $table " .
"ON $table.bug_id = bugs.bug_id " .
"AND $table.fieldid = $fieldid " .
"AND $table.who = $id";
$$term = "($table.bug_when IS NOT NULL)";
}
sub _in_search_results
{
my $self = shift;
my %func_args = @_;
my ($not_in, $f, $v, $term) =
@func_args{qw(__not_in f v term)};
my $query = LookupNamedQuery(trim($$v));
my $queryparams = new Bugzilla::CGI($query);
my $search = new Bugzilla::Search(
params => $queryparams,
fields => ["bugs.bug_id"],
user => Bugzilla->user,
);
my $sqlquery = $search->getSQL();
unless ($not_in)
{
$$term = "($$f IN ($sqlquery))";
}
else
{
$$term = "($$f NOT IN ($sqlquery))";
}
}
sub _not_in_search_results
{
return _in_search_results(@_, __not_in => 1);
}
sub LookupNamedQuery
{
my ($name, $sharer_id, $query_type, $throw_error) = @_;
my $user = Bugzilla->login(LOGIN_REQUIRED);
my $dbh = Bugzilla->dbh;
my $owner_id;
$throw_error = 1 unless defined $throw_error;
# $name and $sharer_id are safe -- we only use them below in SELECT
# placeholders and then in error messages (which are always HTML-filtered).
$name || ThrowUserError("query_name_missing");
trick_taint($name);
if ($sharer_id)
{
$owner_id = $sharer_id;
detaint_natural($owner_id);
$owner_id || ThrowUserError('illegal_user_id', { userid => $sharer_id });
}
else
{
$owner_id = $user->id;
}
my @args = ($owner_id, $name);
my $extra = '';
# If $query_type is defined, then we restrict our search.
if (defined $query_type)
{
$extra = ' AND query_type = ? ';
detaint_natural($query_type);
push @args, $query_type;
}
my ($id, $result) = $dbh->selectrow_array(
"SELECT id, query FROM namedqueries WHERE userid = ? AND name = ? $extra",
undef, @args
);
# Some DBs (read: Oracle) incorrectly mark this string as UTF-8
# even though it has no UTF-8 characters in it, which prevents
# Bugzilla::CGI from later reading it correctly.
{
use utf8;
utf8::downgrade($result) if utf8::is_utf8($result);
}
if (!defined($result))
{
return 0 unless $throw_error;
ThrowUserError("missing_query", {
queryname => $name,
sharer_id => $sharer_id,
});
}
if ($sharer_id && $sharer_id ne $user->id)
{
my $group = $dbh->selectrow_array(
"SELECT group_id FROM namedquery_group_map WHERE namedquery_id = ?",
undef, $id
);
if (!grep { $_ == $group } values %{$user->groups})
{
ThrowUserError("missing_query", {
queryname => $name,
sharer_id => $sharer_id,
});
}
}
$result || ThrowUserError("buglist_parameters_required", { queryname => $name });
return $result;
}
1;

80
buglist.cgi
View File

@ -217,68 +217,6 @@ sub DiffDate {
return $date;
}
sub LookupNamedQuery {
my ($name, $sharer_id, $query_type, $throw_error) = @_;
my $user = Bugzilla->login(LOGIN_REQUIRED);
my $dbh = Bugzilla->dbh;
my $owner_id;
$throw_error = 1 unless defined $throw_error;
# $name and $sharer_id are safe -- we only use them below in SELECT
# placeholders and then in error messages (which are always HTML-filtered).
$name || ThrowUserError("query_name_missing");
trick_taint($name);
if ($sharer_id) {
$owner_id = $sharer_id;
detaint_natural($owner_id);
$owner_id || ThrowUserError('illegal_user_id', {'userid' => $sharer_id});
}
else {
$owner_id = $user->id;
}
my @args = ($owner_id, $name);
my $extra = '';
# If $query_type is defined, then we restrict our search.
if (defined $query_type) {
$extra = ' AND query_type = ? ';
detaint_natural($query_type);
push(@args, $query_type);
}
my ($id, $result) = $dbh->selectrow_array("SELECT id, query
FROM namedqueries
WHERE userid = ? AND name = ?
$extra",
undef, @args);
# Some DBs (read: Oracle) incorrectly mark this string as UTF-8
# even though it has no UTF-8 characters in it, which prevents
# Bugzilla::CGI from later reading it correctly.
utf8::downgrade($result) if utf8::is_utf8($result);
if (!defined($result)) {
return 0 unless $throw_error;
ThrowUserError("missing_query", {'queryname' => $name,
'sharer_id' => $sharer_id});
}
if ($sharer_id) {
my $group = $dbh->selectrow_array('SELECT group_id
FROM namedquery_group_map
WHERE namedquery_id = ?',
undef, $id);
if (!grep {$_ == $group} values(%{$user->groups()})) {
ThrowUserError("missing_query", {'queryname' => $name,
'sharer_id' => $sharer_id});
}
}
$result
|| ThrowUserError("buglist_parameters_required", {'queryname' => $name});
return $result;
}
# Inserts a Named Query (a "Saved Search") into the database, or
# updates a Named Query that already exists..
# Takes four arguments:
@ -434,8 +372,9 @@ $filename =~ s/"/\\"/g; # escape quotes
# Take appropriate action based on user's request.
if ($cgi->param('cmdtype') eq "dorem") {
if ($cgi->param('remaction') eq "run") {
$buffer = LookupNamedQuery(scalar $cgi->param("namedcmd"),
scalar $cgi->param('sharer_id'));
$buffer = Bugzilla::Search::LookupNamedQuery(
scalar $cgi->param("namedcmd"), scalar $cgi->param('sharer_id')
);
# If this is the user's own query, remember information about it
# so that it can be modified easily.
$vars->{'searchname'} = $cgi->param('namedcmd');
@ -544,8 +483,10 @@ elsif (($cgi->param('cmdtype') eq "doit") && defined $cgi->param('remtype')) {
my $is_new_name = 0;
if ($query_name) {
# Make sure this name is not already in use by a normal saved search.
if (LookupNamedQuery($query_name, undef, QUERY_LIST, !THROW_ERROR)) {
ThrowUserError('query_name_exists', {'name' => $query_name});
if (Bugzilla::Search::LookupNamedQuery(
$query_name, undef, QUERY_LIST, !THROW_ERROR))
{
ThrowUserError('query_name_exists', { name => $query_name });
}
$is_new_name = 1;
}
@ -556,10 +497,13 @@ elsif (($cgi->param('cmdtype') eq "doit") && defined $cgi->param('remtype')) {
# exists, add/remove bugs to it, else create it. But if we are
# considering an existing tag, then it has to exist and we throw
# an error if it doesn't (hence the usage of !$is_new_name).
if (my $old_query = LookupNamedQuery($query_name, undef, LIST_OF_BUGS, !$is_new_name)) {
if (my $old_query = Bugzilla::Search::LookupNamedQuery(
$query_name, undef, LIST_OF_BUGS, !$is_new_name))
{
# We get the encoded query. We need to decode it.
my $old_cgi = new Bugzilla::CGI($old_query);
foreach my $bug_id (split /[\s,]+/, scalar $old_cgi->param('bug_id')) {
foreach my $bug_id (split /[\s,]+/, scalar $old_cgi->param('bug_id'))
{
$bug_ids{$bug_id} = 1 if detaint_natural($bug_id);
}
}

18
rss-comments.cgi
View File

@ -11,6 +11,7 @@ use Bugzilla::Bug;
use Bugzilla::Constants;
use Bugzilla::Error;
use Bugzilla::Util;
use Bugzilla::Search;
my $user = Bugzilla->login(LOGIN_REQUIRED);
my $userid = $user->id;
@ -26,7 +27,7 @@ $vars->{buginfo} = $cgi->param('buginfo');
my $title = $cgi->param('namedcmd');
if ($title)
{
my $storedquery = LookupNamedQuery($dbh, $userid, $title);
my $storedquery = Bugzilla::Search::LookupNamedQuery($title, $userid);
$cgi = new Bugzilla::CGI($storedquery);
}
@ -109,18 +110,3 @@ $template->process('list/comments.rss.tmpl', $vars)
|| ThrowTemplateError($template->error());
exit;
sub LookupNamedQuery
{
my ($dbh, $userid, $name) = @_;
trick_taint($name);
my ($query) = $dbh->selectrow_array(
"SELECT query FROM namedqueries WHERE userid=? AND name=?",
undef, $userid, $name
);
ThrowUserError("missing_query", { queryname => $name })
unless defined $query;
ThrowUserError("buglist_parameters_required", { queryname => $name })
unless $query;
return $query;
}

5
template/en/default/search/boolean-charts.html.tmpl
View File

@ -41,7 +41,10 @@
{ name => "changedfrom", description => "changed from" },
{ name => "changedto", description => "changed to" },
{ name => "changedby", description => "changed by" },
{ name => "matches", description => "matches" } ] %]
{ name => "matches", description => "matches" },
{ name => "insearch", description => "matched by saved search" },
{ name => "notinsearch", description => "not matched by saved search" },
] %]
<p>
<strong>