mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15714 from owncloud/fix-ldap-xpmode 

always open filter tab in raw mode, when 'Manually enter LDAP filters' i...
This commit is contained in:
Morris Jobke 2015-04-18 01:27:19 +02:00
parent 7ab1f807fb fe237fd159
commit 4dd2ad7f4a
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/user_ldap/js/wizard/wizardTabAbstractFilter.js
View File

@ -237,6 +237,7 @@ OCA = OCA || {};
* @inheritdoc * @inheritdoc
*/ */
onActivate: function() { onActivate: function() {
this._super();
this.considerFeatureRequests(); this.considerFeatureRequests();
}, },

8
apps/user_ldap/js/wizard/wizardTabGeneric.js
View File

@ -75,9 +75,13 @@ OCA = OCA || {};
/** /**
* this is called by the main view, if the tab is being switched to. * 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 * updates the tab when the model loaded a configuration and notified

1
apps/user_ldap/js/wizard/wizardTabLoginFilter.js
View File

@ -184,6 +184,7 @@ OCA = OCA || {};
* @inheritdoc * @inheritdoc
*/ */
onActivate: function() { onActivate: function() {
this._super();
this.considerFeatureRequests(); this.considerFeatureRequests();
if(!this.managedItems.ldap_login_filter.$element.val()) { if(!this.managedItems.ldap_login_filter.$element.val()) {
this.configModel.requestWizard('ldap_login_filter'); this.configModel.requestWizard('ldap_login_filter');