diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2013-12-04 14:01:31 +0100 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-12-04 17:57:47 +0100 |
| commit | 430f85cc59ec8cbd229748d678c6da0f2de337eb (patch) | |
| tree | 9c32d9711e94b7cd672de247e77551328a6c06d4 /apps/user_ldap/js | |
| parent | 1c6568cf687b395ce67a5bbea0e0c87bbe8fb41e (diff) | |
| download | nextcloud-server-430f85cc59ec8cbd229748d678c6da0f2de337eb.tar.gz nextcloud-server-430f85cc59ec8cbd229748d678c6da0f2de337eb.zip | |
LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by just opening the admin page
Diffstat (limited to 'apps/user_ldap/js')
| -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 5b5f2030635..801de12ea94 100644 --- a/apps/user_ldap/js/settings.js +++ b/apps/user_ldap/js/settings.js @@ -489,13 +489,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); @@ -517,9 +521,12 @@ var LdapWizard = { $(id + " + button").css('display', 'inline'); }, + isConfigurationActiveControlLocked: true, + init: function() { LdapWizard.basicStatusCheck(); LdapWizard.functionalityCheck(); + LdapWizard.isConfigurationActiveControlLocked = false; }, initGroupFilter: function() { |