[Bps-public-commit] RT-BugTracker branch, rt4, updated. c8c6ee1b849d889b18fd3db15cb88e0bfb17c886

[Thomas Sibley]

The branch, rt4 has been updated
       via  c8c6ee1b849d889b18fd3db15cb88e0bfb17c886 (commit)
       via  ed10228b7cd5ff9694b56806b57fde9d6a555591 (commit)
      from  4e1848a7bdde6ee5ac4b433ff4f8bb8c89eb9f57 (commit)

Summary of changes:
 html/Dist/Elements/ErrorDisabled |  3 +--
 html/Ticket/Elements/ShowQueue   | 44 +++++++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 21 deletions(-)

- Log -----------------------------------------------------------------
commit ed10228b7cd5ff9694b56806b57fde9d6a555591
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Mar 1 17:13:30 2013 -0800

    Update ShowQueue from RT 4

diff --git a/html/Ticket/Elements/ShowQueue b/html/Ticket/Elements/ShowQueue
index 7187708..6dcce58 100644
--- a/html/Ticket/Elements/ShowQueue
+++ b/html/Ticket/Elements/ShowQueue
@@ -1,40 +1,40 @@
 %# BEGIN BPS TAGGED BLOCK {{{
-%# 
+%#
 %# COPYRIGHT:
-%# 
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%#                                          <jesse at bestpractical.com>
-%# 
+%#
+%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
+%#                                          <sales at bestpractical.com>
+%#
 %# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
+%#
+%#
 %# LICENSE:
-%# 
+%#
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
 %# been provided with this software, but in any event can be snarfed
 %# from www.gnu.org.
-%# 
+%#
 %# This work is distributed in the hope that it will be useful, but
 %# WITHOUT ANY WARRANTY; without even the implied warranty of
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
-%# 
+%#
 %# 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.
-%# 
-%# 
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+%#
+%#
 %# CONTRIBUTION SUBMISSION POLICY:
-%# 
+%#
 %# (The following paragraph is not intended to limit the rights granted
 %# to you to modify and distribute this software under the terms of
 %# the GNU General Public License and is only of importance to you if
 %# you choose to contribute your changes and enhancements to the
 %# community by submitting them to Best Practical Solutions, LLC.)
-%# 
+%#
 %# By intentionally submitting any modifications, corrections or
 %# derivatives to this work, or any other work intended for use with
 %# Request Tracker, to Best Practical Solutions, LLC, you confirm that
@@ -43,16 +43,22 @@
 %# royalty-free, perpetual, license to use, copy, create derivative
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
-%# 
+%#
 %# END BPS TAGGED BLOCK }}}
-%# This is probably fine to leave as an overriding template. The 3.6 and 3.8
-%# have no real logic to them.
-<a href="<% $RT::WebPath %>/Dist/Display.html?Queue=<% $value |uhn %>"><% $name %></a>
+<a href="<% RT->Config->Get("WebPath") %>/Dist/Display.html?Queue=<% $value |u %>"><% $name %></a>
 <%ARGS>
+$Ticket => undef
 $QueueObj
 </%ARGS>
 <%INIT>
 my $name = my $value = $QueueObj->Name;
+
+if ( not $value and $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
+    $name = $value = $QueueObj->__Value('Name');
+}
+
 $name = '#'. ($value = $QueueObj->id)
     unless defined $value && length $value;
 </%INIT>

commit c8c6ee1b849d889b18fd3db15cb88e0bfb17c886
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Mar 1 17:21:33 2013 -0800

    Use /Elements/Header, not a non-existent /Dist/Elements/Header

diff --git a/html/Dist/Elements/ErrorDisabled b/html/Dist/Elements/ErrorDisabled
index f40cb63..1f61e72 100644
--- a/html/Dist/Elements/ErrorDisabled
+++ b/html/Dist/Elements/ErrorDisabled
@@ -1,5 +1,4 @@
-<& /Dist/Elements/Header, Title => loc("Error") &>
-
+<& /Elements/Header, Title => loc("Error") &>
 <& /Elements/Tabs &>
 
 <& /Dist/Elements/ShowNotes, Queue => $Queue &>

-----------------------------------------------------------------------