From 399fe6fbe3f008649b65fb330dbad14544c38f60 Mon Sep 17 00:00:00 2001
From: Yung Han Khoe <yung@webgui-svn>
Date: Thu, 7 Aug 2008 11:52:30 +0000
Subject: [PATCH] fixed: Thingy: Subtext disappears when editing a field

---
 docs/changelog/7.x.x.txt           |  1 +
 lib/WebGUI/Asset/Wobject/Thingy.pm | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 902b4b4f7..3e6fb0461 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -33,6 +33,7 @@
  - fixed: viewing badges in IE 6/7
  - fixed: Shop/Transaction was not updating shopCreditDeduction column.  Added that to the update and now users correctly have purchases deducted from their instore credit.
  - fixed: Hover Help outdated: automatically request commit
+ - fixed: Thingy: Subtext disappears when editing a field
 
 7.5.18
  - fixed: Collateral Image Manager broken in Firefox 3
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index 18599bd78..216e86b07 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -1326,8 +1326,8 @@ sub www_editThing {
         else{
             $formElement = $self->getFormElement($field);     
         }
-        if ($field->{subText}){
-            $formElement .= '<span class="formSubtext">'.$field->{subText}.'</span>';
+        if ($field->{subtext}){
+            $formElement .= '<span class="formSubtext">'.$field->{subtext}.'</span>';
         }
 
         $fieldsHTML .= "<li class='list1' id='$field->{fieldId}'>"
@@ -1720,8 +1720,8 @@ sub www_editFieldSave {
     else{
         $formElement = $self->getFormElement(\%properties);
     }
-    if ($properties{subText}){
-        $formElement .= '<span class="formSubtext">'.$properties{subText}.'</span>';
+    if ($properties{subtext}){
+        $formElement .= '<br /><span class="formSubtext">'.$properties{subtext}.'</span>';
     }
 
     $listItemHTML = "<table>\n<tr>\n<td style='width:100px;' valign='top' class='formDescription'>".$label."</td>\n"
@@ -1824,7 +1824,7 @@ sub www_editThingData {
             "isHidden" => $hidden,
             "isVisible" => ($field{status} eq "visible" && !$hidden),
             "isRequired" => ($field{status} eq "required" && !$hidden),
-            "subtext" => $field{subText},
+            "subtext" => $field{subtext},
         );
         push(@field_loop, { map {("field_".$_ => $fieldProperties{$_})} keys(%fieldProperties) });
     }