diff options
author | mark <mark> | 2011-02-18 01:24:56 +0000 |
---|---|---|
committer | mark <mark> | 2011-02-18 01:24:56 +0000 |
commit | 9f8decd5ee70e747cd3cec1e0eb917b5493f12e2 (patch) | |
tree | 643da64aac3538ed581d29f710f0cf4c83d42e21 /rt/lib | |
parent | 545e6b27bc390b7fd898fcac32a4d1686249b7a6 (diff) |
option to include resolved tickets in search, RT#11658
Diffstat (limited to 'rt/lib')
-rw-r--r-- | rt/lib/RT/Search/Googleish.pm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/rt/lib/RT/Search/Googleish.pm b/rt/lib/RT/Search/Googleish.pm index 4c14c4756..88634ff3b 100644 --- a/rt/lib/RT/Search/Googleish.pm +++ b/rt/lib/RT/Search/Googleish.pm @@ -175,13 +175,15 @@ sub QueryToSQL { push @queue_clauses, "Queue = '$quoted_queue'"; } + if ( ! @status_clauses + and ! RT->Config->Get('SimpleSearchIncludeResolved') ) { + # implicitly exclude resolved status + @status_clauses = map "Status = '$_'", RT::Queue->ActiveStatusArray(); + } + push @tql_clauses, join( " OR ", sort @id_clauses ); push @tql_clauses, join( " OR ", sort @owner_clauses ); - if ( ! @status_clauses ) { - push @tql_clauses, join( " OR ", map "Status = '$_'", RT::Queue->ActiveStatusArray()); - } else { - push @tql_clauses, join( " OR ", sort @status_clauses ); - } + push @tql_clauses, join( " OR ", sort @status_clauses ); push @tql_clauses, join( " OR ", sort @user_clauses ); push @tql_clauses, join( " OR ", sort @queue_clauses ); @tql_clauses = grep { $_ ? $_ = "( $_ )" : undef } @tql_clauses; |