Francois Gouget : testbot/web: Better initialize and check the Hours Log page parameter.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 96b5a4449a453e83a2f372b5bd03fcdd30511462
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=96b5a4449a453e83a2f372b5bd03fcdd30511462

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Mar 10 12:00:39 2022 +0100

testbot/web: Better initialize and check the Hours Log page parameter.

Call Validate() to make sure the Hours parameter is usable. Note that
due to an implementation detail marking the Hours property as required
is not strictly necessary. But it does reflect that we need a value for
the Download action.
Use SetParam() to provide a default value which removes the need for
redefining GetPropertyValue().
Treat "00" the same as "0".

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/web/admin/Log.pl | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl
index 456e73f..f8e4943 100644
--- a/testbot/web/admin/Log.pl
+++ b/testbot/web/admin/Log.pl
@@ -34,9 +34,16 @@ sub _initialize($$$)
   my ($self, $Request, $RequiredRole) = @_;
 
   my @PropertyDescriptors = (
-    CreateBasicPropertyDescriptor("Hours", "Hours", !1, !1, "N", 2),
+    CreateBasicPropertyDescriptor("Hours", "Hours", !1, 1, "N", 2),
   );
   $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors);
+
+  if (!$self->GetParam("Hours") or !$self->Validate() or
+      !int($self->GetParam("Hours"))) # 00 case!
+  {
+    $self->SetParam("Hours", 1) if (!defined $self->{ErrMessage});
+    $self->SetParam("Action", undef);
+  }
 }
 
 sub GetPageTitle($$)
@@ -46,16 +53,6 @@ sub GetPageTitle($$)
   return "Engine Log - ${ProjectName} Test Bot";
 }
 
-sub GetPropertyValue($$)
-{
-  my ($self, $PropertyDescriptor) = @_;
-
-  my $PropertyName = $PropertyDescriptor->GetName();
-  return 1 if ($PropertyName eq "Hours"); # Provides a default value
-
-  return $self->SUPER::GetPropertyValue($PropertyDescriptor);
-}
-
 sub GetHeaderText($)
 {
   #my ($self) = @_;