[Rt-commit] rtir branch, 2.4-trunk, updated. 2.4.4-5-g689f65d

[Ruslan Zakirov]

The branch, 2.4-trunk has been updated
       via  689f65d62757c188250a7d677910d72856755682 (commit)
      from  17fe5faf08cb7f0dbac902bd6121850bbb9ae747 (commit)

Summary of changes:
 html/RTIR/Tools/ScriptedAction.html |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 689f65d62757c188250a7d677910d72856755682
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Sat Sep 25 01:25:37 2010 +0400

    add requestor on create instead of later during ScriptedAction

diff --git a/html/RTIR/Tools/ScriptedAction.html b/html/RTIR/Tools/ScriptedAction.html
index 191c176..2e702cd 100644
--- a/html/RTIR/Tools/ScriptedAction.html
+++ b/html/RTIR/Tools/ScriptedAction.html
@@ -364,6 +364,7 @@ if ( $ARGS{'SubmitAction'} ) {
             %ARGS,
             Queue          => $investigationq->Id,
             'new-MemberOf' => $Incident->Id,
+            Requestor      => $addr,
         );
         unless ( $Ticket ) {
             Abort("Couldn't launch an Investigation");
@@ -373,11 +374,6 @@ if ( $ARGS{'SubmitAction'} ) {
         }
         push @finalresults, @ChildActions;
 
-        my @watchresults = ProcessTicketWatchers(
-            TicketObj => $Ticket,
-            ARGSRef => { %ARGS, AddRequestor => $addr },
-        );
-
         my $TemplateObj = RT::Template->new( $session{'CurrentUser'} );
         if ( $ARGS{'Template'} ) {
             $TemplateObj->Load( $ARGS{'Template'} );
@@ -424,7 +420,7 @@ if ( $ARGS{'SubmitAction'} ) {
         }
 
         push @finalresults, map { loc("Ticket [_1]: [_2]", $Ticket->Id, $_) }
-            @watchresults, @updateresults;
+            @updateresults;
 
         # delete attachments only after they've been sent to everyone
         delete $session{'Attachments'};

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