diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2013-12-04 14:01:31 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2013-12-04 14:01:31 +0100 |
| commit | 73fa6259bea5ee5c8fd108b8d4216ea2980eea65 (patch) | |
| tree | e65a09dc857fcb00abf2c534255fdf9f2f6f5d6f /apps | |
| parent | 328ebaefde35790fff143aae699751985deae456 (diff) | |
| download | nextcloud-server-73fa6259bea5ee5c8fd108b8d4216ea2980eea65.tar.gz nextcloud-server-73fa6259bea5ee5c8fd108b8d4216ea2980eea65.zip | |
LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by just opening the admin page
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/user_ldap/js/settings.js | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js index 49e6bf8d4bd..acf88ef58a4 100644 --- a/apps/user_ldap/js/settings.js +++ b/apps/user_ldap/js/settings.js @@ -518,13 +518,17 @@ var LdapWizard = { loginfilter = $('#ldap_login_filter').val(); //FIXME: activates a manually deactivated configuration. - if(host && port && base && userfilter && loginfilter) { + if(host && port && base && userfilter && loginfilter) { LdapWizard.updateStatusIndicator(true); if($('#ldap_configuration_active').is(':checked')) { return; } - $('#ldap_configuration_active').prop('checked', true); - LdapWizard.save($('#ldap_configuration_active')[0]); + if(!LdapWizard.isConfigurationActiveControlLocked) { + //avoids a manually deactivated connection will be activated + //upon opening the admin page + $('#ldap_configuration_active').prop('checked', true); + LdapWizard.save($('#ldap_configuration_active')[0]); + } } else { if($('#ldap_configuration_active').is(':checked')) { $('#ldap_configuration_active').prop('checked', false); @@ -546,9 +550,12 @@ var LdapWizard = { $(id + " + button").css('display', 'inline'); }, + isConfigurationActiveControlLocked: true, + init: function() { LdapWizard.basicStatusCheck(); LdapWizard.functionalityCheck(); + LdapWizard.isConfigurationActiveControlLocked = false; }, initGroupFilter: function() { |