import rt 3.6.6

[freeside.git] / rt / html / Ticket / Elements / LoadTextAttachments

diff --git a/rt/html/Ticket/Elements/LoadTextAttachments b/rt/html/Ticket/Elements/LoadTextAttachments
index 370371b..fc83d66 100755 (executable)
--- a/rt/html/Ticket/Elements/LoadTextAttachments
+++ b/rt/html/Ticket/Elements/LoadTextAttachments
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -22,7 +22,9 @@
 %# 
 %# 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.
+%# 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.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -42,7 +44,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
+%# END BPS TAGGED BLOCK }}}
 <%INIT>
 
 my $attachments = RT::Attachments->new( $session{'CurrentUser'} );
@@ -58,11 +60,17 @@ if ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
     
     my $tickets = $attachments->NewAlias('Tickets');
 
+
     $attachments->Join( ALIAS1 => $transactions,
-                        FIELD1 => 'Ticket',
+                        FIELD1 => 'ObjectId',
                         ALIAS2 => $tickets,
                         FIELD2 => 'id' );
 
+    $attachments->Limit( ALIAS => $transactions,
+                         FIELD => 'ObjectType',
+                        VALUE => 'RT::Ticket');
+
+
     $attachments->Limit( ALIAS => $tickets,
                          FIELD => 'EffectiveId',
                          VALUE => $Ticket->id() );
@@ -74,7 +82,9 @@ if ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
     $attachments->Limit ( FIELD => 'ContentType', OPERATOR => '=', VALUE => 'text/plain');
     $attachments->Limit ( FIELD => 'ContentType', OPERATOR => 'STARTSWITH', VALUE => 'message/');
     $attachments->Limit ( FIELD => 'ContentType', OPERATOR => '=', VALUE => 'text');
-
+    if ($RT::SuppressInlineTextFiles) {
+        $attachments->Limit ( FIELD => 'Filename', OPERATOR => 'IS', VALUE => 'NULL');
+    }
 }
 return ($attachments);
 </%INIT>