From 4c8c18409f82d56320a80f6c94f275fa15486897 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Tue, 23 Aug 2011 21:45:51 +0000
Subject: RT future ticket resolve, #13853

---
 rt/etc/initialdata      | 14 ++++++++++++++
 rt/etc/schema.Pg        |  1 +
 rt/etc/schema.mysql-4.1 |  1 +
 3 files changed, 16 insertions(+)

(limited to 'rt/etc')

diff --git a/rt/etc/initialdata b/rt/etc/initialdata
index fc2ed2ffb..7b3f6a6bf 100644
--- a/rt/etc/initialdata
+++ b/rt/etc/initialdata
@@ -104,6 +104,16 @@
       ExecModule  => 'SetPriority',
       Argument    => '',
     },
+    { Name        => 'Cancel Scheduled Resolve',
+      Description => 'Set ticket not to resolve in the future',
+      ExecModule  => 'SetWillResolve',
+      Argument    => '',
+    },
+    { Name        => 'Scheduled Resolve',
+      Description => 'Resolve ticket if its WillResolve date has passed',
+      ExecModule  => 'ScheduledResolve',
+      Argument    => '',
+    },
 );
 
 @ScripConditions = (
@@ -564,6 +574,10 @@ Hour:         { $SubscriptionObj->SubValue('Hour') }
        ScripCondition => 'On Transaction',
        ScripAction    => 'Extract Subject Tag',
        Template       => 'Blank' },
+    {  Description    => 'On Correspond, cancel future resolve',
+       ScripCondition => 'On Correspond',
+       ScripAction    => 'Cancel Scheduled Resolve',
+       Template       => 'Blank' },
 );
 
 @ACL = (
diff --git a/rt/etc/schema.Pg b/rt/etc/schema.Pg
index e3006d073..32c5e872d 100755
--- a/rt/etc/schema.Pg
+++ b/rt/etc/schema.Pg
@@ -404,6 +404,7 @@ CREATE TABLE Tickets (
   Due TIMESTAMP NULL  ,
   Resolved TIMESTAMP NULL  ,
 
+  WillResolve TIMESTAMP NULL  ,
 
   LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated TIMESTAMP NULL  ,
diff --git a/rt/etc/schema.mysql-4.1 b/rt/etc/schema.mysql-4.1
index 173570219..edd3deda7 100755
--- a/rt/etc/schema.mysql-4.1
+++ b/rt/etc/schema.mysql-4.1
@@ -289,6 +289,7 @@ CREATE TABLE Tickets (
   Due DATETIME NULL  ,
   Resolved DATETIME NULL  ,
 
+  WillResolve DATETIME NULL  ,
 
   LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
-- 
cgit v1.2.1