From 9ce482da3960ee43decee41fba53b78c12c3e52c Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sat, 24 Sep 2016 10:28:06 -0700 Subject: rt 4.2.13 ticket#13852 --- rt/share/html/Ticket/Elements/ShowQueue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'rt/share/html/Ticket/Elements/ShowQueue') diff --git a/rt/share/html/Ticket/Elements/ShowQueue b/rt/share/html/Ticket/Elements/ShowQueue index d6b298a76..1e4b4447c 100644 --- a/rt/share/html/Ticket/Elements/ShowQueue +++ b/rt/share/html/Ticket/Elements/ShowQueue @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -45,18 +45,28 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} +% if ( $query ) { +<% $value %> +% } else { <% $value %> +% } <%ARGS> $Ticket => undef $QueueObj <%INIT> my $value = $QueueObj->Name; +my $query; if ( $Ticket and $Ticket->CurrentUserHasRight('SeeQueue') ) { # Grab the queue name anyway if the current user can # see the queue based on his role for this ticket $value = $QueueObj->__Value('Name'); + if ( $session{CurrentUser}->Privileged ) { + my @statuses = $QueueObj->ActiveStatusArray(); + s{(['\\])}{\\$1}g for @statuses; + $query = "Queue = " . $QueueObj->id . " AND ( ". join(" OR ", map {"Status = '$_'"} @statuses) . " )"; + } } $value = '#'. $QueueObj->id -- cgit v1.2.1