From b84c0f8360df3ea20dc8cbd5d736909650b27a54 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Thu, 3 Jul 2008 23:07:59 +0000
Subject: [PATCH] fixed: Wait Until, new approval request workflow not
 available to add

---
 docs/changelog/7.x.x.txt               |  1 +
 docs/upgrades/upgrade_7.5.14-7.5.15.pl | 10 ++++++++++
 etc/WebGUI.conf.original               | 17 +++++++++++++----
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 867975e17..cd8abf9cf 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -8,6 +8,7 @@
  - fixed: Synopsis doesn't update after editting posts
  - fixed: Mail messages not properly decoded
  - fixed: Style 1, other areas broken due to case sensitivity in uploads
+ - fixed: Wait Until, new approval request workflow not available to add
 
 7.5.14
  - fixed: RSS feeds report modified date instead of create date
diff --git a/docs/upgrades/upgrade_7.5.14-7.5.15.pl b/docs/upgrades/upgrade_7.5.14-7.5.15.pl
index a8793bf31..0c9687c66 100644
--- a/docs/upgrades/upgrade_7.5.14-7.5.15.pl
+++ b/docs/upgrades/upgrade_7.5.14-7.5.15.pl
@@ -29,9 +29,19 @@ my $quiet; # this line required
 my $session = start(); # this line required
 
 removeOldGalleryImport($session);
+addMissingWorkflowActivities($session);
 
 finish($session); # this line required
 
+#----------------------------------------------------------------------------
+sub addMissingWorkflowActivities {
+    my $session = shift;
+    print "Adding Request Approval and Wait Until workflow activities to config..." unless $quiet;
+    $session->config->addToArray("workflowActivities/WebGUI::VersionTag", "WebGUI::Workflow::Activity::RequestApprovalForVersionTag::ByCommitterGroup");
+    $session->config->addToArray("workflowActivities/WebGUI::VersionTag", "WebGUI::Workflow::Activity::RequestApprovalForVersionTag::ByLineage");
+    $session->config->addToArray("workflowActivities/WebGUI::VersionTag", "WebGUI::Workflow::Activity::WaitUntil");
+    print "Done.\n" unless $quiet;
+}
 
 #----------------------------------------------------------------------------
 sub removeOldGalleryImport {
diff --git a/etc/WebGUI.conf.original b/etc/WebGUI.conf.original
index db0a74e93..6c4cbcd02 100644
--- a/etc/WebGUI.conf.original
+++ b/etc/WebGUI.conf.original
@@ -413,10 +413,19 @@
 			"WebGUI::Workflow::Activity::SendQueuedMailMessages","WebGUI::Workflow::Activity::CleanDatabaseCache",
 			"WebGUI::Workflow::Activity::CalendarUpdateFeeds","WebGUI::Workflow::Activity::NotifyAdminsWithOpenVersionTags"],
 		"WebGUI::User" : ["WebGUI::Workflow::Activity::CreateCronJob", "WebGUI::Workflow::Activity::NotifyAboutUser"],
-		"WebGUI::VersionTag" : ["WebGUI::Workflow::Activity::CommitVersionTag", "WebGUI::Workflow::Activity::RollbackVersionTag", 
-			"WebGUI::Workflow::Activity::TrashVersionTag", "WebGUI::Workflow::Activity::CreateCronJob",
-			"WebGUI::Workflow::Activity::UnlockVersionTag", "WebGUI::Workflow::Activity::NotifyAboutVersionTag",
-                        "WebGUI::Workflow::Activity::RequestApprovalForVersionTag", "WebGUI::Workflow::Activity::ExportVersionTagToHtml"]
+        "WebGUI::VersionTag" : [
+            "WebGUI::Workflow::Activity::CommitVersionTag",
+            "WebGUI::Workflow::Activity::RollbackVersionTag",
+            "WebGUI::Workflow::Activity::TrashVersionTag",
+            "WebGUI::Workflow::Activity::CreateCronJob",
+            "WebGUI::Workflow::Activity::UnlockVersionTag",
+            "WebGUI::Workflow::Activity::NotifyAboutVersionTag",
+            "WebGUI::Workflow::Activity::RequestApprovalForVersionTag",
+            "WebGUI::Workflow::Activity::RequestApprovalForVersionTag::ByCommitterGroup",
+            "WebGUI::Workflow::Activity::RequestApprovalForVersionTag::ByLineage",
+            "WebGUI::Workflow::Activity::ExportVersionTagToHtml",
+            "WebGUI::Workflow::Activity::WaitUntil"
+        ]
 		},
 
 # Enter the graphing plugins that you want to enable for your site.