From 721a8ced26a09232d6b52a3862860ad406f0cd57 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sat, 4 Jul 2009 19:26:36 +0000
Subject: [PATCH] Use as many autogenerated form fields as possible.

---
 lib/WebGUI/Asset/Wobject/Poll.pm | 93 ++++++++++++++------------------
 1 file changed, 41 insertions(+), 52 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index 8da34efec..cfe7163a9 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -45,35 +45,54 @@ sub definition {
 		tableName=>'Poll',
 		icon=>'poll.gif',
 		className=>'WebGUI::Asset::Wobject::Poll',
+		autoGenerateForms=>1,
 		properties=>{
 			templateId =>{
-				fieldType=>"template",
-				defaultValue=>'PBtmpl0000000000000055'
-				},
+                tab          => 'display',
+				fieldType    => "template",
+				defaultValue => 'PBtmpl0000000000000055',
+                label        => $i18n->get(73),
+                hoverHelp    => $i18n->get('73 description'),
+                namespace    => "Poll",
+            },
 			active=>{
-				fieldType=>"yesNo",
-				defaultValue=>1
-				},
+                tab          => 'properties',
+				fieldType    => "yesNo",
+				defaultValue => 1,
+                label        => $i18n->get(3),
+                hoverHelp    => $i18n->get('3 description'),
+            },
 			karmaPerVote=>{
 				fieldType=>"integer",
-				defaultValue=>0
+				defaultValue=>0,
+                autoGenerate=>0,
 				}, 
 			graphWidth=>{
 				fieldType=>"integer",
-				defaultValue=>150
+				defaultValue=>150,
+                autoGenerate=>0,
 				}, 
 			voteGroup=>{
-				fieldType=>"group",
-				defaultValue=>7
-				}, 
+                tab          => 'security',
+				fieldType    => "group",
+				defaultValue => 7,
+                label        => $i18n->get(4),
+                hoverHelp    => $i18n->get('4 description'),
+            }, 
 			question=>{
-				fieldType=>"text",
-				defaultValue=>undef
-				}, 
+                tab          => 'properties',
+				fieldType    => "text",
+				defaultValue => undef,
+                label        => $i18n->get(6),
+                hoverHelp    => $i18n->get('6 description'),
+            }, 
 			randomizeAnswers=>{
-				defaultValue=>1,
-				fieldType=>"yesNo"
-				},
+                tab          => 'properties',
+				fieldType    => "yesNo",
+				defaultValue => 1,
+                label        => $i18n->get(72),
+                hoverHelp    => $i18n->get('72 description'),
+            },
 			a1=>{
 				fieldType=>"hidden",
 				defaultValue=>undef
@@ -218,30 +237,12 @@ sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->SUPER::getEditForm; 
 	my $i18n = WebGUI::International->new($self->session,"Asset_Poll");
-   	$tabform->getTab("display")->template(
-      		-value=>$self->getValue('templateId'),
-      		-namespace=>"Poll",
-		-label=>$i18n->get(73),
-		-hoverHelp=>$i18n->get('73 description'),
-   		);
-        my ($i, $answers);
-	for ($i=1; $i<=20; $i++) {
-                if ($self->get('a'.$i) =~ /\C/) {
-                        $answers .= $self->getValue("a".$i)."\n";
-                }
+    my ($i, $answers);
+    for ($i=1; $i<=20; $i++) {
+        if ($self->get('a'.$i) =~ /\C/) {
+            $answers .= $self->getValue("a".$i)."\n";
         }
-	$tabform->getTab("security")->yesNo(
-		-name=>"active",
-		-label=>$i18n->get(3),
-		-hoverHelp=>$i18n->get('3 description'),
-		-value=>$self->getValue("active")
-		);
-        $tabform->getTab("security")->group(
-		-name=>"voteGroup",
-		-label=>$i18n->get(4),
-		-hoverHelp=>$i18n->get('4 description'),
-		-value=>[$self->getValue("voteGroup")]
-		);
+    }
 	if ($self->session->setting->get("useKarma")) {
 		$tabform->getTab("properties")->integer(
 			-name=>"karmaPerVote",
@@ -261,12 +262,6 @@ sub getEditForm {
 		-hoverHelp=>$i18n->get('5 description'),
 		-value=>$self->getValue("graphWidth")
 		);
-	$tabform->getTab("properties")->text(
-		-name=>"question",
-		-label=>$i18n->get(6),
-		-hoverHelp=>$i18n->get('6 description'),
-		-value=>$self->getValue("question")
-		);
         $tabform->getTab("properties")->textarea(
 		-name=>"answers",
 		-label=>$i18n->get(7),
@@ -274,12 +269,6 @@ sub getEditForm {
 		-subtext=>('<span class="formSubtext"><br />'.$i18n->get(8).'</span>'),
 		-value=>$answers
 		);
-	$tabform->getTab("display")->yesNo(
-		-name=>"randomizeAnswers",
-		-label=>$i18n->get(72),
-		-hoverHelp=>$i18n->get('72 description'),
-		-value=>$self->getValue("randomizeAnswers")
-		);
 	$tabform->getTab("properties")->yesNo(
 		-name=>"resetVotes",
 		-label=>$i18n->get(10),