import rt 3.4.6

1 files changed, 41 insertions, 16 deletions

diff --git a/rt/html/Elements/Quicksearch b/rt/html/Elements/Quicksearch
index 4acbc20..5f1af0f 100644
--- a/rt/html/Elements/Quicksearch
+++ b/rt/html/Elements/Quicksearch
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -22,9 +22,7 @@
 %# 
 %# You should have received a copy of the GNU General Public License
 %# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -45,17 +43,44 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<div class="ticket-overview">
-<&|/Widgets/TitleBox, title => loc("Quick search"), bodyclass => "",
-   titleright => loc("Edit"), titleright_href => $RT::WebPath.'/Prefs/Quicksearch.html' &>
-<& /Elements/QueueSummary,
-   cache => 'quick_search_queues',
-   queue_filter => sub { $_->CurrentUserHasRight('ShowTicket') && !exists $unwanted->{$_->Name} },
-   conditions => [ {cond => "Status = 'new'",  name => loc ('new')  },
-		   {cond => "Status = 'open'", name => loc ('open') },
-		   {cond => "Status = 'stalled'", name => loc ('stalled') }] &>
-</&>
-</div>
+<& /Elements/TitleBoxStart, title => loc("Quick search"), bodyclass => "" &>
+
+<TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>                       
+<tr>                                                                          
+       <th class="collection-as-table" align=left><&|/l&>Queue</&></th>                                         
+       <th class="collection-as-table" align=right><&|/l&>New</&></th>
+       <th class="collection-as-table" align=right><&|/l&>Open</&></th>          
+</tr>
+
+<%PERL>
+my $i;
+while (my $queue = $Queues->Next) {
+  next unless ($queue->CurrentUserHasRight('ShowTicket'));
+
+  my $qid = $queue->Id;
+  my $new_q = "Queue = '$qid' AND Status = 'new'";
+  my $open_q = "Queue = '$qid' AND Status = 'open'";
+  my $all_q = "Queue = '$qid' AND (Status = 'open' OR Status = 'new')";
+
+  $Tickets->FromSQL($open_q);
+  my $open = $Tickets->Count();
+
+  $Tickets->FromSQL($new_q);
+  my $new = $Tickets->Count();
+
+  $i++;
+</%PERL>
+<TR class="<% $i%2 ? 'oddline' : 'evenline'%>" >                                
+<td><A HREF="<% $RT::WebPath%>/Search/Results.html?Query=<%$all_q |nu%>&Rows=50" TITLE="<% $queue->Description %>"><%$queue->Name%></a></TD>
+<td align="right"><A HREF="<% $RT::WebPath%>/Search/Results.html?Query=<%$new_q |nu%>&Rows=50"><%$new%></a></TD>
+<td align="right"><A HREF="<% $RT::WebPath%>/Search/Results.html?Query=<%$open_q |nu%>&Rows=50"><%$open%></a></TD>
+</TR>
+% }
+</TABLE>
+<& /Elements/TitleBoxEnd &>
+
 <%INIT>
-my $unwanted = $session{'CurrentUser'}->UserObj->Preferences('QuickSearch', {});
+my $Queues = RT::Queues->new($session{'CurrentUser'}); 
+$Queues->UnLimit();
+my $Tickets = RT::Tickets->new($session{'CurrentUser'});
 </%INIT>