1 files changed, 67 insertions, 23 deletions

diff --git a/rt/html/Ticket/Elements/FindAttachments b/rt/html/Ticket/Elements/FindAttachments
index b8a0dd8b6..a1e973f0e 100755
--- a/rt/html/Ticket/Elements/FindAttachments
+++ b/rt/html/Ticket/Elements/FindAttachments
@@ -1,3 +1,48 @@
+%# {{{ BEGIN BPS TAGGED BLOCK
+%# 
+%# COPYRIGHT:
+%#  
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%#                                          <jesse@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., 675 Mass Ave, Cambridge, MA 02139, USA.
+%# 
+%# 
+%# 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
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+%# 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
 <%INIT>
 my %documents;
 
@@ -6,41 +51,40 @@ my %documents;
 
 # We force the cache of ticket transactions to get populated up front. otherwise, the 
 # code that looks at attachments will look at each one in turn.
-my $transactions = $Ticket->Transactions->First;
-
-
 my $attachments = RT::Attachments->new( $session{'CurrentUser'} );
 
 $attachments->Columns( qw( Id Filename ContentType Headers Subject Parent ContentEncoding ContentType TransactionId Created));
 
-if ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
-    my $transactions = $attachments->NewAlias('Transactions');
-    $attachments->Join( ALIAS1 => 'main',
-                                           FIELD1 => 'TransactionId',
-                                           ALIAS2 => $transactions,
-                                           FIELD2 => 'id' );
+my $transactions = $attachments->NewAlias('Transactions');
+$attachments->Join( ALIAS1 => 'main',
+		    FIELD1 => 'TransactionId',
+		    ALIAS2 => $transactions,
+		    FIELD2 => 'id' );
     
-    my $tickets = $attachments->NewAlias('Tickets');
+my $tickets = $attachments->NewAlias('Tickets');
 
-    $attachments->Join( ALIAS1 => $transactions,
-                        FIELD1 => 'Ticket',
-                        ALIAS2 => $tickets,
-                        FIELD2 => 'id' );
+$attachments->Join( ALIAS1 => $transactions,
+		    FIELD1 => 'Ticket',
+		    ALIAS2 => $tickets,
+		    FIELD2 => 'id' );
 
-    $attachments->Limit( ALIAS => $tickets,
-                         FIELD => 'EffectiveId',
-                         VALUE => $Ticket->id() );
-    # if the user may not see comments do not return them
-    unless ( $Ticket->CurrentUserHasRight('ShowTicketComments') ) {
-        $attachments->Limit( ALIAS    => $transactions,
-                             FIELD    => 'Type',
-                             OPERATOR => '!=',
-                             VALUE    => "Comment" );
+if ($Tickets) {
+    while ($Ticket = $Tickets->Next) {
+	$attachments->Limit( ALIAS => $tickets,
+			     FIELD => 'EffectiveId',
+			     VALUE => $Ticket->id() );
     }
+} else {
+    $attachments->Limit( ALIAS => $tickets,
+			 FIELD => 'EffectiveId',
+			 VALUE => $Ticket->id() );
 }
+
+
 return ($attachments);
 </%INIT>
 <%ARGS>
 $Ticket => undef
+$Tickets => undef
 </%ARGS>