From a877a505c41591717bb0cfdfc1e24e5590cd3d38 Mon Sep 17 00:00:00 2001
From: Yung Han Khoe <yung@webgui-svn>
Date: Mon, 6 Oct 2008 12:56:05 +0000
Subject: [PATCH] fixed: Combo box does not show possible values in Thingy

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

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index e5a3f4ce5..3360069f7 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -8,15 +8,18 @@
  - fixed: DataForm doesn't keep posted values properly when data fails validation
  - fixed: Documentation for DataForm and Thingy updated for Possible Values field
  - added a new permission denied page for version tag approval
- - fixed: Thingy list type form elements do not support key/value pairs
- - fixed: Select Slider borked in Thingy
- - fixed: Shortcuts includes HTML head data twice
+ - fixed: Thingy list type form elements do not support key/value pairs (SDH
+   Consulting Group)
+ - fixed: Select Slider borked in Thingy (SDH Consulting Group)
+ - fixed: Shortcuts includes HTML head data twice 
  - fixed: DataForm entry table isn't properly indexed
  - fixed: DataForm can't export fields containing newlines
  - fixed: UserList templates use incorrect variable names
  - fixed: International characters in password prevents login
  - fixed: SelectSlider form control is broken
  - fixed: testEnvironment.pl can't find WebGUI modules after installing a prerequisite
+ - fixed: Combo box does not show possible values in Thingy (SDH Consulting
+   Group)
 
 7.6.0
  - added: users may now customize the post received page for the CS
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index fc1a9a3d9..b362f5c88 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -830,7 +830,7 @@ sub getFormElement {
         }
     }
 
-    if (WebGUI::Utility::isIn($data->{fieldType},qw(SelectList CheckList SelectBox Attachments))) {
+    if (WebGUI::Utility::isIn($data->{fieldType},qw(SelectList CheckList SelectBox Attachments Combo))) {
         my @defaultValues;
         if ($self->session->form->param($name)) {
             @defaultValues = $self->session->form->selectList($name);
@@ -844,7 +844,7 @@ sub getFormElement {
         $param{value} = \@defaultValues;
     }
 
-    if (WebGUI::Utility::isIn($data->{fieldType},qw(SelectList SelectBox CheckList RadioList SelectSlider))) {
+    if (WebGUI::Utility::isIn($data->{fieldType},qw(SelectList SelectBox CheckList RadioList SelectSlider Combo))) {
         delete $param{size};
 
         my $values = WebGUI::Operation::Shared::secureEval($self->session,$data->{possibleValues});