wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Arthur Schiwon 2014-10-29 18:52:55 +01:00
parent 105940b9dc
commit 8a48b088ed
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/user_ldap/js/experiencedAdmin.js
View file

@ -50,17 +50,9 @@ ExperiencedAdmin.prototype.isExperienced = function() {
* switches all LDAP filters from Assisted to Raw mode.
*/
ExperiencedAdmin.prototype.enableRawMode = function() {
var containers = {
'toggleRawGroupFilter': '#rawGroupFilterContainer',
'toggleRawLoginFilter': '#rawLoginFilterContainer',
'toggleRawUserFilter' : '#rawUserFilterContainer'
};
for(var method in containers) {
if($(containers[method]).hasClass('invisible')) {
this.wizard[method]();
}
}
LdapWizard._save({id: 'ldapGroupFilterMode'}, LdapWizard.filterModeRaw);
LdapWizard._save({id: 'ldapUserFilterMode' }, LdapWizard.filterModeRaw);
LdapWizard._save({id: 'ldapLoginFilterMode'}, LdapWizard.filterModeRaw);
};
ExperiencedAdmin.prototype.updateUserTab = function(mode) {

10
apps/user_ldap/js/settings.js
View file

@ -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');