Francois Gouget : testbot/web: Use AddError() for the user details page.

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Thu Jul  7 15:13:39 2022 +0200

testbot/web: Use AddError() for the user details page.

This replaces SetError() and direct field access.

Signed-off-by: Francois Gouget 
Signed-off-by: Alexandre Julliard

---

testbot/web/admin/UserDetails.pl | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl
index 833a36d1..da8cebf2 100644
--- a/testbot/web/admin/UserDetails.pl
+++ b/testbot/web/admin/UserDetails.pl
@@ -88,10 +88,10 @@ sub OnItemAction($$$)
     return 1 if ($self->{User}->Roles->HasItem($Item->Name));

$self->{User}->AddRole($Item);
-    my $ErrMessage = $self->{User}->Roles->Save();
+    my ($_ErrKey, $ErrProperty, $ErrMessage) = $self->{User}->Roles->Save();
     if (defined $ErrMessage)
     {
-      $self->{EnclosingPage}->SetError(undef, $ErrMessage);
+      $self->{EnclosingPage}->AddError($ErrMessage, $ErrProperty);
       return 0;
     }
     NotifyAdministrator("New administrator user: $self->{UserName}",
@@ -100,13 +100,12 @@ sub OnItemAction($$$)
   }
   if ($self->{RW} and $Action eq "Remove role")
   {
-    my $UserRole = $self->{User}->Roles->GetItem($Item->Name);
+    my $Roles = $self->{User}->Roles;
+    my $UserRole = $Roles->GetItem($Item->Name);
     return 1 if (!$UserRole);

-    my $ErrMessage = $self->{User}->Roles->DeleteItem($UserRole);
-    if (defined $ErrMessage)
+    if ($self->{EnclosingPage}->AddError($Roles->DeleteItem($UserRole)))
     {
-      $self->{EnclosingPage}->SetError(undef, $ErrMessage);
       return 0;
     }
     NotifyAdministrator("Removed an administrator: $self->{UserName}",
@@ -114,7 +113,7 @@ sub OnItemAction($$$)
     return 1;
   }

-  $self->{EnclosingPage}->SetError(undef, "No per-Item action defined for $Action");
+  $self->{EnclosingPage}->AddError("No per-Item action defined for $Action");
   return 0;
 }

@@ -194,8 +193,7 @@ sub OnApprove($)
   my ($self) = @_;

return !1 if (!$self->Save());
-  $self->{ErrMessage} = $self->{Item}->Approve();
-  return !1 if (defined $self->{ErrMessage});
+  return !1 if ($self->AddError($self->{Item}->Approve()));
   exit($self->RedirectToParent());
 }

@@ -204,8 +202,12 @@ sub OnReject($)
   my ($self) = @_;

$self->{Item}->Status('deleted');
-  ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save();
-  return !1 if (defined $self->{ErrMessage});
+  my ($ErrProperty, $ErrMessage) = $self->{Item}->Save();
+  if (defined $ErrMessage)
+  {
+    $self->AddError($ErrMessage, $ErrProperty);
+    return !1;
+  }
   # Forcefully log out that user by deleting his web sessions
   DeleteSessions($self->{Item});
   exit($self->RedirectToParent());