From 748ec0c440ea2ffc091cf595df72334bcc726905 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 17 Sep 2010 09:02:54 -0700
Subject: [PATCH] Code cleanup for moving form generation out of
 getFormTemplateVars

---
 lib/WebGUI/Asset/Wobject/DataForm.pm | 30 ++++++++--------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 91a3966e8..9d96eba22 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -85,7 +85,7 @@ sub _createForm {
 
 #-------------------------------------------------------------------
 
-=head2 _getFormFields ($entry, @orderedFields)
+=head2 _getFormFields ($entry)
 
 Return a list of form fields for this DataForm.
 
@@ -93,10 +93,6 @@ Return a list of form fields for this DataForm.
 
 A WebGUI::AssetCollateral::DataForm::Entry collateral object, with data for an entry in the DataForm.
 
-=head3 @orderedFields
-
-Field configurations for this DataForm
-
 =cut
 
 sub _getFormFields {
@@ -941,24 +937,14 @@ sub getRecordTemplateVars {
     for my $field_form (@fields) {
         my ($field, $form) = @{ $field_form };
         # need a copy
-        my $value;
-        my $func       = $session->form->process('func');
-        my $ignoreForm = $func eq 'editSave' || $func eq 'editFieldSave';
-        if ($entry) {
-            $value = $entry->field( $field->{name} );
-        }
-        elsif (!$ignoreForm && defined (my $formValue = $self->session->form->process($field->{name}))) {
-            $value = $formValue;
-        }
-        my $hidden
-            = ($field->{status} eq 'hidden' && !$session->var->isAdminOn)
-            || ($field->{isMailField} && !$self->get('mailData'));
+        my $hidden =  ($field->{status} eq 'hidden' && !$session->var->isAdminOn)
+                   || ($field->{isMailField} && !$self->get('mailData'));
 	
-	# populate Rich Editor field if the field is an HTMLArea
-	if ($field->{type} eq "HTMLArea") { 
-		$field->{htmlAreaRichEditor} = $self->get("htmlAreaRichEditor") ;
-	}
-        $value = $form->getValueAsHtml;
+        # populate Rich Editor field if the field is an HTMLArea
+        if ($field->{type} eq "HTMLArea") { 
+            $field->{htmlAreaRichEditor} = $self->get("htmlAreaRichEditor") ;
+        }
+        my $value = $form->getValueAsHtml;
         my %fieldProperties = (
             "form"          => $form->toHtml,
             "name"          => $field->{name},