diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2012-06-30 01:03:13 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2012-06-30 01:03:13 -0700 |
| commit | f3c4966ed1f6ec3db7accd6dcdd3a5a3821d72a7 (patch) | |
| tree | e5e9a077260613e6117d4697dd2985abd9b03d34 /rt/share/html/Ticket/Elements/ShowQueue | |
| parent | cf7cd8efc7095aadbdfb0cd8e7ea0e2e8b9e9085 (diff) | |
| parent | cd3eb95ed1f3dc3e04cfc2b3b405f75b3ab086da (diff) | |
merging RT 4.0.6
Diffstat (limited to 'rt/share/html/Ticket/Elements/ShowQueue')
| -rw-r--r-- | rt/share/html/Ticket/Elements/ShowQueue | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/rt/share/html/Ticket/Elements/ShowQueue b/rt/share/html/Ticket/Elements/ShowQueue index 6742d4a72..255225591 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-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -45,12 +45,20 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<% $QueueObj->Name %> +<% $value %> <%ARGS> +$Ticket => undef $QueueObj </%ARGS> <%INIT> my $value = $QueueObj->Name; + +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'); +} + $value = '#'. $QueueObj->id unless defined $value && length $value; </%INIT> |