[Rt-commit] [rtir] 01/02: Merge branch '3.0-trunk'

[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 4279f6f3dbd7ba1accb3746b43fd223328037991
Merge: 1a6f06f 7fd4126
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Wed May 14 15:41:28 2014 -0400

    Merge branch '3.0-trunk'
    
    Conflicts:
    	README
    	docs/UPGRADING

 MANIFEST                                        |  3 +-
 docs/UPGRADING                                  |  2 ++
 html/Callbacks/RTIR/Elements/MakeClicky/Default | 25 ++++++++++++-
 html/RTIR/Incident/Reply/index.html             |  7 ++--
 t/015-make-clicky.t                             | 47 ++++++++++++++++++++++++-
 5 files changed, 78 insertions(+), 6 deletions(-)

diff --cc html/RTIR/Incident/Reply/index.html
index 533871b,71467a6..1ed2424
--- a/html/RTIR/Incident/Reply/index.html
+++ b/html/RTIR/Incident/Reply/index.html
@@@ -171,11 -171,12 +171,12 @@@ if ( $SubmitTicket && !$checks_failure 
          my $id = $Ticket->id;
  
          push @results, map { loc("Ticket [_1]: [_2]", $id, $_) }
 -            ProcessUpdateMessage( TicketObj => $Ticket, ARGSRef => \%ARGS );
 +            ProcessUpdateMessage( TicketObj => $Ticket, ARGSRef => \%ARGS, KeepAttachments => 1 );
  
-         my %additional = (
-             Status => RT::IR->MapStatus( $Status, $incident_cycle => $Ticket ),
-         );
+         my %additional;
+         if ( $Status ) {
+             $additional{Status} = RT::IR->MapStatus( $Status, $incident_cycle => $Ticket );
+         }
  
          unless ( RT::IR->IsLinkedToActiveIncidents( $Ticket, $IncidentObj ) ) {
              push @results, ProcessTicketBasics(

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