[3/5] testbot/CGI: Let FormPage::GenerateField() print the label as well as the input tag.

[Francois Gouget]

---
 testbot/lib/ObjectModel/CGI/FormPage.pm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm
index 77c02b3..740b97e 100644
--- a/testbot/lib/ObjectModel/CGI/FormPage.pm
+++ b/testbot/lib/ObjectModel/CGI/FormPage.pm
@@ -148,14 +148,7 @@ sub GenerateFields($)
   foreach my $PropertyDescriptor (@{$PropertyDescriptors})
   {
     my $Display = $self->DisplayProperty($PropertyDescriptor);
-    if ($Display)
-    {
-      print "<div class='ItemProperty'><label>",
-            $self->CGI->escapeHTML($self->GetDisplayName($PropertyDescriptor)) .
-            "</label>";
-      $self->GenerateField($PropertyDescriptor, $Display);
-      print "</div>\n";
-    }
+    $self->GenerateField($PropertyDescriptor, $Display) if ($Display);
   }
 }
 
@@ -231,6 +224,10 @@ sub GenerateField($$$)
 {
   my ($self, $PropertyDescriptor, $Display) = @_;
 
+  print "<div class='ItemProperty'><label>",
+        $self->CGI->escapeHTML($self->GetDisplayName($PropertyDescriptor)) .
+        "</label>";
+
   my $Value = $self->GetDisplayValue($PropertyDescriptor);
   if ($Display eq "rw")
   {
@@ -303,6 +300,8 @@ sub GenerateField($$$)
       print " ";
     }
   }
+
+  print "</div>\n";
 }
 
 sub GenerateRequired($$)
-- 
2.0.0