dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep old behavior if no JS (#1976)

Browse Source
This commit is contained in:
Christophe Maudoux 2021-02-05 18:05:59 +01:00
parent 6428cd0a0a
commit 55071d5210
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
View File

@ -483,11 +483,16 @@ sub display {
$self->loadedModules->{
"Lemonldap::NG::Portal::Plugins::FindUser"};
my $fields = [];
$fields = $plugin->buildForm()
if ( $plugin
if (
$plugin
&& $self->conf->{findUser}
&& $self->conf->{impersonationRule}
&& $self->conf->{findUserSearchingAttributes} );
&& $self->conf->{findUserSearchingAttributes}
)
{
$login = $req->data->{findUser};
$fields = $plugin->buildForm();
}
# Authentication loop
if ( $self->conf->{authentication} eq 'Choice'
@ -503,6 +508,7 @@ sub display {
DISPLAY_OPENID_FORM => 0,
DISPLAY_YUBIKEY_FORM => 0,
FIELDS => $fields,
SPOOFID => $login,
FINDUSER => scalar @$fields
);
}
@ -536,6 +542,7 @@ sub display {
( $displayType eq "logo" ? $self->conf->{portal} : 0 ),
MSG => $req->info(),
FIELDS => $fields,
SPOOFID => $login,
FINDUSER => scalar @$fields
);
}

4
lemonldap-ng-portal/t/68-FindUser-with-Combination.t
View File

@ -8,7 +8,7 @@ require 't/test-lib.pm';
my $res;
my $json;
my $request;
my $maintests = 23;
my $maintests = 24;
SKIP: {
skip 'LLNGTESTLDAP is not set', $maintests unless ( $ENV{LLNGTESTLDAP} );
@ -70,6 +70,8 @@ m%<input id="spoofIdfield" name="spoofId" type="text" class="form-control" value
),
'Post FindUser request'
);
ok( $res->[2]->[0] =~ m%value="dwho"%, 'value="dwho"' )
or explain( $res->[2]->[0], 'value="dwho"' );
ok( $res->[2]->[0] =~ m%autocomplete="off"%, 'autocomplete="off"' )
or explain( $res->[2]->[0], 'autocomplete="off"' );
ok(

4
lemonldap-ng-portal/t/68-FindUser-with-DBI.t
View File

@ -5,7 +5,7 @@ use IO::String;
require 't/test-lib.pm';
my $maintests = 53;
my $maintests = 54;
my $userdb = tempdb();
SKIP: {
@ -105,6 +105,8 @@ m%<input id="spoofIdfield" name="spoofId" type="text" class="form-control" value
),
'Post FindUser request'
);
ok( $res->[2]->[0] =~ m%value="dwho"%, 'value="dwho"' )
or explain( $res->[2]->[0], 'value="dwho"' );
ok( $res->[2]->[0] =~ m%autocomplete="off"%, 'autocomplete="off"' )
or explain( $res->[2]->[0], 'autocomplete="off"' );
ok(