projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import rt 3.4.4
[freeside.git]
/
rt
/
html
/
Ticket
/
Elements
/
LoadTextAttachments
diff --git
a/rt/html/Ticket/Elements/LoadTextAttachments
b/rt/html/Ticket/Elements/LoadTextAttachments
index
370371b
..
943568f
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:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-200
4
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-200
5
Best Practical Solutions, LLC
%# <jesse@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <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.
%#
%# 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'} );
<%INIT>
my $attachments = RT::Attachments->new( $session{'CurrentUser'} );
@@
-58,11
+58,17
@@
if ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
my $tickets = $attachments->NewAlias('Tickets');
my $tickets = $attachments->NewAlias('Tickets');
+
$attachments->Join( ALIAS1 => $transactions,
$attachments->Join( ALIAS1 => $transactions,
- FIELD1 => '
Ticket
',
+ FIELD1 => '
ObjectId
',
ALIAS2 => $tickets,
FIELD2 => 'id' );
ALIAS2 => $tickets,
FIELD2 => 'id' );
+ $attachments->Limit( ALIAS => $transactions,
+ FIELD => 'ObjectType',
+ VALUE => 'RT::Ticket');
+
+
$attachments->Limit( ALIAS => $tickets,
FIELD => 'EffectiveId',
VALUE => $Ticket->id() );
$attachments->Limit( ALIAS => $tickets,
FIELD => 'EffectiveId',
VALUE => $Ticket->id() );