[freeside-commits] freeside/rt/lib/RT/Search Googleish.pm, 1.1.1.5, 1.1.1.5.4.1

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/rt/lib/RT/Search
In directory wavetail.420.am:/tmp/cvs-serv23706/lib/RT/Search

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	Googleish.pm 
Log Message:
option to include resolved tickets in search, RT#11658

Index: Googleish.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/lib/RT/Search/Googleish.pm,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.5.4.1
diff -u -w -d -r1.1.1.5 -r1.1.1.5.4.1
--- Googleish.pm	18 May 2010 18:44:46 -0000	1.1.1.5
+++ Googleish.pm	18 Feb 2011 01:24:56 -0000	1.1.1.5.4.1
@@ -175,13 +175,15 @@
         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 @user_clauses );
     push @tql_clauses, join( " OR ", sort @queue_clauses );
     @tql_clauses = grep { $_ ? $_ = "( $_ )" : undef } @tql_clauses;