From a03815d61151b16ccf7def4c49041665b493dba0 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Tue, 29 Mar 2016 16:40:55 +0200 Subject: [PATCH] Revert "Some changes in saml login system." This reverts commit 502988c8122b3b1a30d3b43bc734b8e48e38d380. Conflicts: pandora_console/general/login_page.php pandora_console/index.php --- pandora_console/godmode/setup/setup_auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php index 58ee2ef332..466eacc4a3 100644 --- a/pandora_console/godmode/setup/setup_auth.php +++ b/pandora_console/godmode/setup/setup_auth.php @@ -253,7 +253,7 @@ echo ''; function show_selected_rows (event) { var auth_method = $(this).val(); - if (auth_method !== 'mysql') { + if ((auth_method !== 'mysql') && (auth_method !== 'saml')) { $('tr.remote').show(); show_autocreate_options(null); }