[Rt-commit] [rtir] 13/13: Merge branch '3.2/attachment-handling'

[Kevin Falcone]

This is an automated email from the git hooks/post-receive script.

falcone pushed a commit to branch master
in repository rtir.

commit e44a808a54dab9355f1c8640b36a4249c3b750c3
Merge: 0ab9e78 b9d0beb
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Wed Apr 16 17:25:38 2014 -0400

    Merge branch '3.2/attachment-handling'
    
    Conflicts:
    	html/RTIR/Incident/Create.html

 html/RTIR/Create.html                      | 44 ++----------------------------
 html/RTIR/Display.html                     |  5 ++--
 html/RTIR/Edit.html                        |  2 --
 html/RTIR/Incident/BulkAbandon.html        |  7 +++--
 html/RTIR/Incident/Create.html             |  3 +-
 html/RTIR/Incident/Display.html            |  5 ++--
 html/RTIR/Incident/Reply/index.html        |  8 ++++--
 html/RTIR/Investigation/Elements/Create    |  2 --
 html/RTIR/Tools/ScriptedAction.html        | 16 +++++------
 html/RTIR/Update.html                      |  4 +--
 lib/RT/Condition/RTIR_LinkingToIncident.pm | 17 ++++++++----
 t/009-attachments-processing.t             |  2 +-
 12 files changed, 39 insertions(+), 76 deletions(-)

diff --cc html/RTIR/Incident/Create.html
index da51898,0c30a81..96e373b
--- a/html/RTIR/Incident/Create.html
+++ b/html/RTIR/Incident/Create.html
@@@ -308,9 -309,7 +309,9 @@@ $m->callback
  my $QueueObj = RT::Queue->new( $session{'CurrentUser'} );
  $QueueObj->Load( 'Incidents' ) || Abort( loc("Queue could not be loaded.") );
  
 +my $ticket = RT::Ticket->new($session{'CurrentUser'}); # empty ticket object
 +
- $m->comp( '/RTIR/Create.html:ProcessAttachments', %ARGS );
+ ProcessAttachments(ARGSRef => \%ARGS);
  
  my $checks_failure = 0;
  
diff --cc html/RTIR/Incident/Reply/index.html
index e76b8d6,a42bdcc..533871b
--- a/html/RTIR/Incident/Reply/index.html
+++ b/html/RTIR/Incident/Reply/index.html
@@@ -164,9 -165,8 +165,8 @@@ if ( $SubmitTicket && $gnupg_widget ) 
  }
  
  if ( $SubmitTicket && !$checks_failure ) {
-     $ARGS{'UpdateAttachments'} = delete $session{'Attachments'};
  
 -    my $incident_cycle = $IncidentObj->QueueObj->Lifecycle;
 +    my $incident_cycle = $IncidentObj->QueueObj->LifecycleObj;
      foreach my $Ticket ( @selected_children ) {
          my $id = $Ticket->id;
  

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.