Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
bugzilla
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
bugzilla
Commits
44f2dd57
Commit
44f2dd57
authored
Sep 16, 2013
by
Frédéric Buclin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug 785565: Search by change history between two dates doesn't give expected result
r/a=glob
parent
4a8ab2af
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
35 deletions
+14
-35
Search.pm
Bugzilla/Search.pm
+14
-35
No files found.
Bugzilla/Search.pm
View file @
44f2dd57
...
...
@@ -1515,6 +1515,8 @@ sub _special_parse_chfield {
@fields
=
map
{
$_
eq
'[Bug creation]'
?
'creation_ts'
:
$_
}
@fields
;
return
undef
unless
(
$date_from
ne
''
||
$date_to
ne
''
||
$value_to
ne
''
);
my
$clause
=
new
Bugzilla::Search::
Clause
();
# It is always safe and useful to push delta_ts into the charts
...
...
@@ -1536,44 +1538,21 @@ sub _special_parse_chfield {
$clause
->
add
(
'delta_ts'
,
'lessthaneq'
,
$date_to
);
}
# Basically, we construct the chart like:
#
# (added_for_field1 = value OR added_for_field2 = value)
# AND (date_field1_changed >= date_from OR date_field2_changed >= date_from)
# AND (date_field1_changed <= date_to OR date_field2_changed <= date_to)
#
# Theoretically, all we *really* would need to do is look for the field id
# in the bugs_activity table, because we've already limited the search
# by delta_ts above, but there's no chart to do that, so we check the
# change date of the fields.
if
(
$value_to
ne
''
)
{
my
$value_clause
=
new
Bugzilla::Search::
Clause
(
'OR'
);
foreach
my
$field
(
@fields
)
{
$value_clause
->
add
(
$field
,
'changedto'
,
$value_to
);
}
$clause
->
add
(
$value_clause
);
}
# chfieldto is supposed to be a relative date or a date of the form
# YYYY-MM-DD, i.e. without the time appended to it. We append the
# time ourselves so that the end date is correctly taken into account.
$date_to
.=
' 23:59:59'
if
$date_to
=~
/^\d{4}-\d{1,2}-\d{1,2}$/
;
if
(
$date_from
ne
''
)
{
my
$from_clause
=
new
Bugzilla::Search::
Clause
(
'OR'
);
foreach
my
$field
(
@fields
)
{
$from_clause
->
add
(
$field
,
'changedafter'
,
$date_from
);
}
$clause
->
add
(
$from_clause
);
}
if
(
$date_to
ne
''
)
{
# chfieldto is supposed to be a relative date or a date of the form
# YYYY-MM-DD, i.e. without the time appended to it. We append the
# time ourselves so that the end date is correctly taken into account.
$date_to
.=
' 23:59:59'
if
$date_to
=~
/^\d{4}-\d{1,2}-\d{1,2}$/
;
my
$join_clause
=
new
Bugzilla::Search::
Clause
(
'OR'
);
my
$to_clause
=
new
Bugzilla::Search::
Clause
(
'OR'
);
foreach
my
$field
(
@fields
)
{
$to_clause
->
add
(
$field
,
'changedbefore'
,
$date_to
);
}
$clause
->
add
(
$to_clause
);
foreach
my
$field
(
@fields
)
{
my
$sub_clause
=
new
Bugzilla::Search::
ClauseGroup
();
$sub_clause
->
add
(
condition
(
$field
,
'changedto'
,
$value_to
))
if
$value_to
ne
''
;
$sub_clause
->
add
(
condition
(
$field
,
'changedafter'
,
$date_from
))
if
$date_from
ne
''
;
$sub_clause
->
add
(
condition
(
$field
,
'changedbefore'
,
$date_to
))
if
$date_to
ne
''
;
$join_clause
->
add
(
$sub_clause
);
}
$clause
->
add
(
$join_clause
);
return
@
{
$clause
->
children
}
?
$clause
:
undef
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment