From d082e4eee32567607bae5300e206a36a90247128 Mon Sep 17 00:00:00 2001
From: khenn <frank@plainblack.com>
Date: Fri, 4 Jun 2010 17:00:24 -0500
Subject: [PATCH] Fixed #11613 - After successful save of a Thing, the form is
 cleared for the next thing to be entered

---
 lib/WebGUI/Asset/Wobject/Thingy.pm | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index fb13b64ae..4ff5b4ff2 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -2466,6 +2466,8 @@ sub editThingData {
     my $thingId         = shift || $session->form->process('thingId');
     my $thingDataId     = shift || $session->form->process('thingDataId') || "new";
     my $thingProperties = shift || $self->getThing($thingId);
+    my $errors          = shift;
+    my $resetForm       = shift;
     my $i18n            = WebGUI::International->new($self->session, "Asset_Thingy");
 
     my $canEditThingData = $self->canEditThingData($thingId, $thingDataId, $thingProperties);
@@ -2475,7 +2477,7 @@ sub editThingData {
     my (%thingData, $fields,@field_loop,$fieldValue, $privilegedGroup);
     my $var = $self->get;
     my $url = $self->getUrl;
-    my $errors = shift;
+    
     $var->{error_loop} = $errors if ($errors);
 
     $var->{canEditThings} = $self->canEdit;
@@ -2523,14 +2525,17 @@ sub editThingData {
         ,[$self->getId,$thingId]);
     while (my %field = $fields->hash) {
         my $fieldName = 'field_'.$field{fieldId};
-        if ($session->form->process("func") eq "editThingDataSave"){
-            $fieldValue = $session->form->process($fieldName,$field{fieldType},$field{defaultValue});
+        $fieldValue = undef;
+        unless ($resetForm) {
+            if ($session->form->process("func") eq "editThingDataSave"){
+                $fieldValue = $session->form->process($fieldName,$field{fieldType},$field{defaultValue});
+            }
+            else{
+                $fieldValue = $thingData{"field_".$field{fieldId}};
+            }
         }
-        else{
-            $fieldValue = $thingData{"field_".$field{fieldId}};
-        }
-        $field{value} = $fieldValue || $field{defaultValue};     
-        my $formElement .= $self->getFormElement(\%field);
+        $field{value} = $fieldValue || $field{defaultValue};
+        my $formElement .= $self->getFormPlugin(\%field,($resetForm eq ""))->toHtml;
         
         my $hidden = ($field{status} eq "hidden" && !$self->session->var->isAdminOn);
         my $value = $field{value};
@@ -2604,7 +2609,7 @@ sub www_editThingDataSave {
         return $self->www_viewThingData($thingId,$newThingDataId);
     }
     elsif ($thingProperties->{afterSave} eq "addThing") {
-        return $self->www_editThingData($thingId,"new");
+        return $self->www_editThingData($thingId,"new",undef,undef,"resetForm");
     }
     elsif ($thingProperties->{afterSave} =~ m/^searchOther_/x){
         $otherThingId = $thingProperties->{afterSave};
@@ -2614,7 +2619,7 @@ sub www_editThingDataSave {
     elsif ($thingProperties->{afterSave} =~ m/^addOther_/x){
         $otherThingId = $thingProperties->{afterSave};
         $otherThingId =~ s/^addOther_//x;
-        return $self->www_editThingData($otherThingId,"new");
+        return $self->www_editThingData($otherThingId,"new",undef,"resetForm");
     }
     # if afterSave is thingy default or in any other case return www_view()
     else {