From fe237fd15988fde2bccac924bfee9233dd87f3d9 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 17 Apr 2015 23:33:59 +0200 Subject: [PATCH] always open filter tab in raw mode, when 'Manually enter LDAP filters' is checked --- apps/user_ldap/js/wizard/wizardTabAbstractFilter.js | 1 + apps/user_ldap/js/wizard/wizardTabGeneric.js | 8 ++++++-- apps/user_ldap/js/wizard/wizardTabLoginFilter.js | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js b/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js index 024b6af65d0..702c30a5a69 100644 --- 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 524d2a048a1..720628fa609 100644 --- 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 9438fd73346..b73d267d168 100644 --- 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'); -- 2.39.5