always open filter tab in raw mode, when 'Manually enter LDAP filters' is checked

diff --git a/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js b/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js
index 024b6af65d0302275ecf71a3feafb06c5e8fc128..702c30a5a69cc8540e2454d3d47f16d350d0ae1f 100644 (file)
--- a/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js
+++ b/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js
@@ -237,6 +237,7 @@ OCA = OCA || {};
                 * @inheritdoc
                 */
                onActivate: function() {
+                       this._super();
                        this.considerFeatureRequests();
                },
 

diff --git a/apps/user_ldap/js/wizard/wizardTabGeneric.js b/apps/user_ldap/js/wizard/wizardTabGeneric.js
index 524d2a048a18bd2d9408867d362e850f2ffdc3e0..720628fa609b97e4aeb52a5d4777fbe3188c1648 100644 (file)
--- a/apps/user_ldap/js/wizard/wizardTabGeneric.js
+++ b/apps/user_ldap/js/wizard/wizardTabGeneric.js
@@ -75,9 +75,13 @@ OCA = OCA || {};
 
                /**
                 * this is called by the main view, if the tab is being switched to.
-                * The concrete tab view can implement this if necessary.
                 */
-               onActivate: function() { },
+               onActivate: function() {
+                       if(!_.isUndefined(this.filterModeKey)
+                               && this.configModel.configuration.ldap_experienced_admin === '1') {
+                               this.setFilterMode(this.configModel.FILTER_MODE_RAW);
+                       }
+               },
 
                /**
                 * updates the tab when the model loaded a configuration and notified

diff --git a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
index 9438fd73346470366e4d56141701fb918cfe7123..b73d267d1687330f4101593c5177888a7875d144 100644 (file)
--- a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
+++ b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
@@ -184,6 +184,7 @@ OCA = OCA || {};
                 * @inheritdoc
                 */
                onActivate: function() {
+                       this._super();
                        this.considerFeatureRequests();
                        if(!this.managedItems.ldap_login_filter.$element.val()) {
                                this.configModel.requestWizard('ldap_login_filter');