diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2014-10-29 18:52:55 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-10-29 18:53:07 +0100 |
| commit | 8a48b088ed22f23f961da3c0eb9591989f8cc98a (patch) | |
| tree | ea92d3cd9d94fafb6c98e9d7dd48df4ab147f2be /apps/user_ldap/js/settings.js | |
| parent | 105940b9dcb52d43440dfbc738d284ce8f2b0acd (diff) | |
| download | nextcloud-server-8a48b088ed22f23f961da3c0eb9591989f8cc98a.tar.gz nextcloud-server-8a48b088ed22f23f961da3c0eb9591989f8cc98a.zip | |
on xp'ed mode and switching configurations: save raw mode instead of toggling filter mode in tabs since their status is unknown and dealt with by the Wizard. Fixes #11848
Diffstat (limited to 'apps/user_ldap/js/settings.js')
| -rw-r--r-- | apps/user_ldap/js/settings.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js index 1627528200f..fa40aba73b4 100644 --- a/apps/user_ldap/js/settings.js +++ b/apps/user_ldap/js/settings.js @@ -838,9 +838,10 @@ var LdapWizard = { } }, - onToggleRawFilterConfirmation: function(currentMode, callback) { - if(!LdapWizard.admin.isExperienced() - || currentMode === LdapWizard.filterModeAssisted + onToggleRawFilterConfirmation: function(currentMode, isRawVisible, callback) { + if( !LdapWizard.admin.isExperienced() + || currentMode === LdapWizard.filterModeAssisted + || (LdapWizard.admin.isExperienced() && !isRawVisible) ) { return callback(true); } @@ -855,6 +856,7 @@ var LdapWizard = { toggleRawGroupFilter: function() { LdapWizard.onToggleRawFilterConfirmation( LdapWizard.groupFilter.getMode(), + !$('#rawGroupFilterContainer').hasClass('invisible'), function(confirmed) { if(confirmed !== true) { return; @@ -875,6 +877,7 @@ var LdapWizard = { toggleRawLoginFilter: function() { LdapWizard.onToggleRawFilterConfirmation( LdapWizard.loginFilter.getMode(), + !$('#rawLoginFilterContainer').hasClass('invisible'), function(confirmed) { if(confirmed !== true) { return; @@ -909,6 +912,7 @@ var LdapWizard = { toggleRawUserFilter: function() { LdapWizard.onToggleRawFilterConfirmation( LdapWizard.userFilter.getMode(), + !$('#rawUserFilterContainer').hasClass('invisible'), function(confirmed) { if(confirmed === true) { LdapWizard.blacklistRemove('ldap_userlist_filter'); |