summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-02-21 10:12:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-02-21 10:12:29 +0000
commit328da54240c1385eacc24c1323b4cbc1ecddb03e (patch)
tree3db18820ec6efa1f1097624efdad2d3e10fcb846
parentc059e2e0a75788dd418069db0e37b6301bf526ed (diff)
downloaddrakx-328da54240c1385eacc24c1323b4cbc1ecddb03e.tar
drakx-328da54240c1385eacc24c1323b4cbc1ecddb03e.tar.gz
drakx-328da54240c1385eacc24c1323b4cbc1ecddb03e.tar.bz2
drakx-328da54240c1385eacc24c1323b4cbc1ecddb03e.tar.xz
drakx-328da54240c1385eacc24c1323b4cbc1ecddb03e.zip
only accept users using "Accept user" button, and disable "Next" when the
login name is filled (bugzilla #20712)
-rw-r--r--perl-install/any.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index d1abe1456..7238c34f8 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -595,6 +595,8 @@ sub inspect {
sub ask_user_one {
my ($in, $users, $security, $u, %options) = @_;
+ $options{needauser} ||= $security >= 3;
+
my @icons = facesnames();
my %high_security_groups = (
@@ -641,9 +643,8 @@ sub ask_user_one {
$u->{name} ||= lc first($u->{realname} =~ /([a-zA-Z0-9_-]+)/);
}
},
- complete => sub { $u->{name} ? &$verif : 0 },
canceled => $verif,
- ok_disabled => sub { $security >= 3 && !@$users || $options{needauser} && !$u->{name} },
+ ok_disabled => sub { $options{needauser} && !@$users || $u->{name} },
} }, [
{ label => N("Real name"), val => \$u->{realname} },
{ label => N("Login name"), val => \$u->{name} },