[Rt-commit] rt branch, 4.2/attach-from-transactions, updated. rt-4.0.1-407-g923d73c

[Thomas Sibley]

The branch, 4.2/attach-from-transactions has been updated
       via  923d73c8660a66f5919fd1c953b448536115e3aa (commit)
      from  dbcab6000ccbac84d41ae7173a1735c9dcb2aaa0 (commit)

Summary of changes:
 share/html/Ticket/Elements/AddAttachments |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 923d73c8660a66f5919fd1c953b448536115e3aa
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Dec 9 10:46:55 2011 -0500

    Don't present transaction attachments when we don't have an existing ticket
    
    QuoteTransaction may be used on Ticket/Create.html, but we don't
    currently handle including attachments from a transaction on create,
    only on update.

diff --git a/share/html/Ticket/Elements/AddAttachments b/share/html/Ticket/Elements/AddAttachments
index 04a4c40..8b93519 100644
--- a/share/html/Ticket/Elements/AddAttachments
+++ b/share/html/Ticket/Elements/AddAttachments
@@ -82,7 +82,7 @@ my $url = sprintf '%s/Ticket/Attachment/%d/%d/%s',
 % }
 <%init>
 my @quoted_attachments;
-if ($QuoteTransaction) {
+if ($QuoteTransaction and $TicketObj and $TicketObj->id) {
     my $txn = RT::Transaction->new( $session{'CurrentUser'} );
     $txn->Load($QuoteTransaction);
     if ($txn->Id and $txn->CurrentUserCanSee) {
@@ -95,4 +95,5 @@ if ($QuoteTransaction) {
 <%args>
 @AttachExisting => ()
 $QuoteTransaction => ''
+$TicketObj => undef
 </%args>

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