This commit was generated by cvs2svn to compensate for changes in r4407,

which included commits to RCS files with non-trunk default branches.

1 files changed, 11 insertions, 8 deletions

diff --git a/rt/html/Ticket/Elements/FindAttachments b/rt/html/Ticket/Elements/FindAttachments
index a1e973f0e..017c77288 100755
--- a/rt/html/Ticket/Elements/FindAttachments
+++ b/rt/html/Ticket/Elements/FindAttachments
@@ -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-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,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 %documents;
 
@@ -63,11 +63,14 @@ $attachments->Join( ALIAS1 => 'main',
     
 my $tickets = $attachments->NewAlias('Tickets');
 
-$attachments->Join( ALIAS1 => $transactions,
-		    FIELD1 => 'Ticket',
-		    ALIAS2 => $tickets,
-		    FIELD2 => 'id' );
-
+  $attachments->Join( ALIAS1 => $transactions,                         
+                        FIELD1 => 'ObjectId',
+                        ALIAS2 => $tickets,
+                        FIELD2 => 'id' );
+    
+    $attachments->Limit( ALIAS => $transactions,
+                         FIELD => 'ObjectType',
+                        VALUE => 'RT::Ticket');
 if ($Tickets) {
     while ($Ticket = $Tickets->Next) {
 	$attachments->Limit( ALIAS => $tickets,