[Rt-commit] [svn] r1586 - in rtir/branches/1.1-TESTING: etc etc/upgrade/1.1.3 html/RTIR html/RTIR/Incident

[leira at pallas.eruditorum.org]

Author: leira
Date: Wed Sep 29 20:24:26 2004
New Revision: 1586

Modified:
   rtir/branches/1.1-TESTING/etc/initialdata
   rtir/branches/1.1-TESTING/etc/upgrade/1.1.3/content
   rtir/branches/1.1-TESTING/html/RTIR/Display.html
   rtir/branches/1.1-TESTING/html/RTIR/Incident/Reply.html
Log:
RT-Ticket: 6115
RT-Status: resolved
RT-Action: correspond
Set Due date of staff responses in a scrip, not in the UI.


Modified: rtir/branches/1.1-TESTING/etc/initialdata
==============================================================================
--- rtir/branches/1.1-TESTING/etc/initialdata	(original)
+++ rtir/branches/1.1-TESTING/etc/initialdata	Wed Sep 29 20:24:26 2004
@@ -344,6 +344,11 @@
        ApplicableTransTypes => 'Correspond',
        ExecModule => 'RTIR_CustomerResponse',
     },
+    {  Name        => 'RTIR Staff Response',    # loc
+       Description => 'Detect an internal response' ,                                            # loc
+       ApplicableTransTypes => 'Correspond',
+       ExecModule => 'RTIR_StaffResponse',
+    },
     {  Name        => 'RTIR Close Ticket',    # loc
        Description => 'A ticket is rejected or resolved' ,                                            # loc
        ApplicableTransTypes => 'Any',
@@ -393,6 +398,21 @@
        ScripCondition => 'RTIR Customer Response',
        ScripAction      => 'RTIR Set Due to Now',
        Template       => 'Blank' },
+    {  Description => "DetectStaffResponse",
+       Queue          => 'Incident Reports',
+       ScripCondition => 'RTIR Staff Response',
+       ScripAction      => 'RTIR Set Due Correspond',
+       Template       => 'Blank' },
+    {  Description => "DetectStaffResponse",
+       Queue          => 'Investigations',
+       ScripCondition => 'RTIR Staff Response',
+       ScripAction      => 'RTIR Set Due Correspond',
+       Template       => 'Blank' },
+    {  Description => "DetectStaffResponse",
+       Queue          => 'Blocks',
+       ScripCondition => 'RTIR Staff Response',
+       ScripAction      => 'RTIR Set Due Correspond',
+       Template       => 'Blank' },
     {  Description => "SetStartsDate",
        Queue            => 'Incidents',
        ScripCondition => 'On Create',

Modified: rtir/branches/1.1-TESTING/etc/upgrade/1.1.3/content
==============================================================================
--- rtir/branches/1.1-TESTING/etc/upgrade/1.1.3/content	(original)
+++ rtir/branches/1.1-TESTING/etc/upgrade/1.1.3/content	Wed Sep 29 20:24:26 2004
@@ -18,6 +18,11 @@
        ApplicableTransTypes => 'Any',
        ExecModule => 'RTIR_RequireDueChange',
     },
+    {  Name        => 'RTIR Staff Response',    # loc
+       Description => 'Detect an internal response' ,                                            # loc
+       ApplicableTransTypes => 'Correspond',
+       ExecModule => 'RTIR_StaffResponse',
+    },
 
 );
 
@@ -52,4 +57,19 @@
        ScripCondition => 'RTIR Reopen Ticket',
        ScripAction      => 'RTIR Set Due Reopen',
        Template       => 'Blank' },
+    {  Description => "DetectStaffResponse",
+       Queue          => 'Investigations',
+       ScripCondition => 'RTIR Staff Response',
+       ScripAction      => 'RTIR Set Due Correspond',
+       Template       => 'Blank' },
+    {  Description => "DetectStaffResponse",
+       Queue          => 'Incident Reports',
+       ScripCondition => 'RTIR Staff Response',
+       ScripAction      => 'RTIR Set Due Correspond',
+       Template       => 'Blank' },
+    {  Description => "DetectStaffResponse",
+       Queue          => 'Blocks',
+       ScripCondition => 'RTIR Staff Response',
+       ScripAction      => 'RTIR Set Due Correspond',
+       Template       => 'Blank' },
 );

Modified: rtir/branches/1.1-TESTING/html/RTIR/Display.html
==============================================================================
--- rtir/branches/1.1-TESTING/html/RTIR/Display.html	(original)
+++ rtir/branches/1.1-TESTING/html/RTIR/Display.html	Wed Sep 29 20:24:26 2004
@@ -232,17 +232,6 @@
       my $action = $1;
       my ($res, $msg)=$Ticket->$action();
       push(@Actions, $msg);
-    } elsif ($ARGS{'Action'} eq 'Respond' && @UpdateActions) {
-      my $date = RT::Date->new($RT::SystemUser);
-      $date->SetToNow;
-      $date->AddDays($RT::OverdueAfter);
-
-      # get business hours
-      my $bizhours = RT::IR::BusinessHours();
-
-      my $due = $bizhours->first_after($date->Unix);
-      $date->Set(Format => 'unix', Value => $due);
-      $ARGS{'Due_Date'} = $date->AsString;
     }
   }
 

Modified: rtir/branches/1.1-TESTING/html/RTIR/Incident/Reply.html
==============================================================================
--- rtir/branches/1.1-TESTING/html/RTIR/Incident/Reply.html	(original)
+++ rtir/branches/1.1-TESTING/html/RTIR/Incident/Reply.html	Wed Sep 29 20:24:26 2004
@@ -190,20 +190,6 @@
     @watchresults = ProcessTicketWatchers(TicketObj => $Ticket, ARGSRef => \%ARGS);    
    } 
 
-    my $date;
-    if (@updateresults) {
-      $date = RT::Date->new($RT::SystemUser);
-      $date->SetToNow;
-      $date->AddDays($RT::OverdueAfter);
-
-      # get business hours
-      my $bizhours = RT::IR::BusinessHours();
-
-      my $due = $bizhours->first_after($date->Unix);
-      $date->Set(Format => 'unix', Value => $due);
-      $ARGS{'Due_Date'} = $date->AsString;
-    }
-
     my @dateresults = ProcessTicketDates(TicketObj => $Ticket, ARGSRef => \%ARGS);
 
     my @tempresults = (@basicresults, @watchresults, @updateresults, @dateresults);