Merge pull request #11850 from owncloud/fix-11848

on xp'ed mode and switching configurations: save raw mode instead of tog...

2 files changed, 10 insertions, 14 deletions

diff --git a/apps/user_ldap/js/experiencedAdmin.js b/apps/user_ldap/js/experiencedAdmin.js
index fac8dd6470f..8d138eecc41 100644
--- a/apps/user_ldap/js/experiencedAdmin.js
+++ b/apps/user_ldap/js/experiencedAdmin.js
@@ -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) {
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');