[10/10] testbot/Users: Add a 'Reject' button for accounts waiting for approval.

Francois Gouget fgouget at codeweavers.com
Wed Apr 3 10:00:50 CDT 2013


---
 testbot/web/admin/UserDetails.pl |   20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl
index f9c1bea..faf8bbd 100644
--- a/testbot/web/admin/UserDetails.pl
+++ b/testbot/web/admin/UserDetails.pl
@@ -57,7 +57,8 @@ sub GetActions
   my @Actions;
   if (!defined $LDAPServer and $self->{Item}->WaitingForApproval())
   {
-    $Actions[0] = "Approve";
+    push @Actions, "Approve";
+    push @Actions, "Reject" if ($self->{Item}->Name);
   }
 
   push(@Actions, @{$self->SUPER::GetActions()});
@@ -76,6 +77,19 @@ sub OnApprove($)
   exit;
 }
 
+sub OnReject($)
+{
+  my $self = shift;
+
+  $self->{Item}->Status('deleted');
+  ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save();
+  return !1 if (defined $self->{ErrMessage});
+  # Forcefully log out that user by deleting his web sessions
+  DeleteSessions($self->{Item});
+  $self->RedirectToList();
+  exit;
+}
+
 sub OnOK($)
 {
   my $self = shift;
@@ -99,6 +113,10 @@ sub OnAction
   {
     return $self->OnApprove();
   }
+  elsif ($Action eq "Reject")
+  {
+    return $self->OnReject();
+  }
   elsif ($Action eq "OK")
   {
     return $self->OnOK();
-- 
1.7.10.4



More information about the wine-patches mailing list