projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/jgoodman/Freeside
[freeside.git]
/
rt
/
share
/
html
/
Ticket
/
Elements
/
ShowQueue
diff --git
a/rt/share/html/Ticket/Elements/ShowQueue
b/rt/share/html/Ticket/Elements/ShowQueue
index
6742d4a
..
5aefe9c
100644
(file)
--- a/
rt/share/html/Ticket/Elements/ShowQueue
+++ b/
rt/share/html/Ticket/Elements/ShowQueue
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
1
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
4
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <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 }}}
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<% $
QueueObj->Nam
e %>
+<% $
valu
e %>
<%ARGS>
<%ARGS>
+$Ticket => undef
$QueueObj
</%ARGS>
<%INIT>
my $value = $QueueObj->Name;
$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>
$value = '#'. $QueueObj->id
unless defined $value && length $value;
</%INIT>