From 709ed6971a4d636cfd8101f3757aa3f75dd40afe Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Fri, 18 Apr 2008 14:51:16 +0000
Subject: [PATCH] merging form fixes

---
 lib/WebGUI/Form/FieldType.pm         |  1 +
 lib/WebGUI/Form/SelectRichEditor.pm  | 12 ++++++++++++
 lib/WebGUI/Form/SubscriptionGroup.pm | 12 ++++++++++++
 lib/WebGUI/Form/Workflow.pm          | 12 ++++++++++++
 lib/WebGUI/i18n/English/WebGUI.pm    | 12 ++++++++++++
 5 files changed, 49 insertions(+)

diff --git a/lib/WebGUI/Form/FieldType.pm b/lib/WebGUI/Form/FieldType.pm
index 5b8f05a2d..79fd327d1 100644
--- a/lib/WebGUI/Form/FieldType.pm
+++ b/lib/WebGUI/Form/FieldType.pm
@@ -169,6 +169,7 @@ sub toHtml {
 	my %options;
 	tie %options, "Tie::IxHash";
     $self->set('options', $self->getTypes);
+    $self->set('sortByValue', 1);
 	return $self->SUPER::toHtml();
 }
 
diff --git a/lib/WebGUI/Form/SelectRichEditor.pm b/lib/WebGUI/Form/SelectRichEditor.pm
index 68d2c4b16..b5050c1bf 100644
--- a/lib/WebGUI/Form/SelectRichEditor.pm
+++ b/lib/WebGUI/Form/SelectRichEditor.pm
@@ -90,6 +90,18 @@ sub getName {
     return WebGUI::International->new($session, 'WebGUI')->get('SelectRichEditor formName');
 }
 
+#-------------------------------------------------------------------
+
+=head2 isDynamicCompatible ( )
+
+A class method that returns a boolean indicating whether this control is compatible with the DynamicField control. Returns 0.
+
+=cut
+
+sub isDynamicCompatible {
+    return 0;
+}
+
 #----------------------------------------------------------------------------
 
 =head2 new
diff --git a/lib/WebGUI/Form/SubscriptionGroup.pm b/lib/WebGUI/Form/SubscriptionGroup.pm
index 589ba8614..ed470e2d0 100644
--- a/lib/WebGUI/Form/SubscriptionGroup.pm
+++ b/lib/WebGUI/Form/SubscriptionGroup.pm
@@ -52,6 +52,18 @@ sub getName {
 
 #-------------------------------------------------------------------
 
+=head2 isDynamicCompatible ( )
+
+A class method that returns a boolean indicating whether this control is compatible with the DynamicField control. Returns 0.
+
+=cut
+
+sub isDynamicCompatible {
+    return 0;
+}
+
+#-------------------------------------------------------------------
+
 =head2 toHtmlWithWrapper ( )
 
 Renders the form field to HTML as a table row. The row is not displayed because there is nothing to display, but it may not be left away because <input> may not be a child of <table> according to the XHTML standard.
diff --git a/lib/WebGUI/Form/Workflow.pm b/lib/WebGUI/Form/Workflow.pm
index 2ae9b46fc..085d7d5c7 100644
--- a/lib/WebGUI/Form/Workflow.pm
+++ b/lib/WebGUI/Form/Workflow.pm
@@ -134,6 +134,18 @@ sub getName {
 
 #-------------------------------------------------------------------
 
+=head2 isDynamicCompatible ( )
+
+A class method that returns a boolean indicating whether this control is compatible with the DynamicField control. Returns 0.
+
+=cut
+
+sub isDynamicCompatible {
+    return 0;
+}
+
+#-------------------------------------------------------------------
+
 =head2 toHtml ( )
 
 Renders a template picker control.
diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index 17bf3f23c..4b377b6cb 100644
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -2645,6 +2645,18 @@ div.tabs {
         context=> 'Form Type Name, as in "Object Class Name"',
     },
 
+    'SubscriptionGroup formName' => {
+        message => q|Subscription Group|,
+        lastUpdated => 0,
+        context=> 'form field type',
+    },
+
+    'SelectRichEditor formName' => {
+        message => q|Choose Rich Editor|,
+        lastUpdated => 0,
+        context=> 'form field type',
+    },
+
     'fieldType' => {
         message => q|Field Type|,
         lastUpdated => 0,