[06/10] testbot/Users: Fix UserDetails.pl to reuse WaitForApproval() instead of incompletely duplicating it.

Francois Gouget fgouget at codeweavers.com
Wed Apr 3 09:58:34 CDT 2013


---
 testbot/web/admin/UserDetails.pl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl
index 9e79aa4..bc56eec 100644
--- a/testbot/web/admin/UserDetails.pl
+++ b/testbot/web/admin/UserDetails.pl
@@ -1,6 +1,7 @@
 # User details page
 #
 # Copyright 2009 Ge van Geldorp
+# Copyright 2013 Francois Gouget
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -53,8 +54,7 @@ sub GetActions
   my $self = shift;
 
   my @Actions;
-  if ($self->{Item}->Active && length($self->{Item}->Password) == 1 &&
-      ! defined($LDAPServer))
+  if (!defined $LDAPServer and $self->{Item}->WaitingForApproval())
   {
     $Actions[0] = "Approve";
   }
-- 
1.7.10.4




More information about the wine-patches mailing list