X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=share%2Fhtml%2FElements%2FQueueSummaryByStatus;h=2a8dc53966c90eba4510e50cf2b265667958118b;hb=c36a7e1d7966547fdb93dfd46ec2d26bfb890620;hp=b843bbaff72e9e97e4dd6a4701d90f0e79643d10;hpb=403d7b0b0eb7d2535f279adb134aecb4fde2438d;p=usit-rt.git
diff --git a/share/html/Elements/QueueSummaryByStatus b/share/html/Elements/QueueSummaryByStatus
index b843bba..2a8dc53 100644
--- a/share/html/Elements/QueueSummaryByStatus
+++ b/share/html/Elements/QueueSummaryByStatus
@@ -58,16 +58,13 @@
my $i = 0;
for my $queue (@queues) {
$i++;
- my $name = $queue->{Name};
- $name =~ s/(['\\])/\\$1/g;
- my $queue_cond = "Queue = '$name' AND ";
my $lifecycle = $lifecycle{ lc $queue->{'Lifecycle'} };
- my $all_q = $queue_cond . '(' . join( " OR ", map "Status = '$_'", grep $lifecycle->IsValid($_), @statuses ) . ')';
+ my @queue_statuses = grep { $lifecycle->IsValid($_) } @statuses;
%PERL>
- <% $queue->{Name} %>
+ <% $queue->{Name} %>
|
<%perl>
@@ -75,7 +72,7 @@ for my $queue (@queues) {
if ( $lifecycle->IsValid( $status ) ) {
%perl>
- "><% $data->{$queue->{id}}->{$status } || '-' %>
+ <% $data->{$queue->{id}}->{$status } || '-' %>
|
% } else {
- |
@@ -85,6 +82,31 @@ for my $queue (@queues) {
% }
<%INIT>
+my $build_search_link = sub {
+ my ($queue_name, $extra_query) = @_;
+ $queue_name =~ s/(['\\])/\\$1/g; #'
+
+ return RT->Config->Get('WebPath')
+ . "/Search/Results.html?Query="
+ . $m->interp->apply_escapes("Queue = '$queue_name' AND $extra_query", 'u');
+};
+
+my $link_all = sub {
+ my ($queue, $all_statuses) = @_;
+ return $build_search_link->($queue->{Name}, "(".join(" OR ", map "Status = '$_'", @$all_statuses).")");
+};
+
+my $link_status = sub {
+ my ($queue, $status) = @_;
+ return $build_search_link->($queue->{Name}, "Status = '$status'");
+};
+
+$m->callback(
+ CallbackName => 'LinkBuilders',
+ build_search_link => \$build_search_link,
+ link_all => \$link_all,
+ link_status => \$link_status,
+);
my $Queues = RT::Queues->new( $session{'CurrentUser'} );
$Queues->UnLimit();