Browse Source

compile user and login filter on the first time automatically, if a suggestion was provided

tags/v8.1.0alpha1
Arthur Schiwon 9 years ago
parent
commit
a8b831b018

+ 1
- 0
apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js View File

@@ -23,6 +23,7 @@ OCA = OCA || {};
'ldap_loginfilter_attributes'
]);
this.setTargetKey('ldap_login_filter');
this.runsOnRequest = true;

this.wizardMethod = 'getUserLoginFilter';
}

+ 1
- 0
apps/user_ldap/js/wizard/wizardDetectorFilterUser.js View File

@@ -22,6 +22,7 @@ OCA = OCA || {};
'ldap_userfilter_objectclass'
]);
this.setTargetKey('ldap_userlist_filter');
this.runsOnRequest = true;

this.wizardMethod = 'getUserListFilter';
}

+ 5
- 0
apps/user_ldap/js/wizard/wizardTabAbstractFilter.js View File

@@ -294,6 +294,11 @@ OCA = OCA || {};
onFeatureReceived: function(view, payload) {
if(payload.feature === view.getObjectClassItem().featureName) {
view.equipMultiSelect(view.getObjectClassItem().$element, payload.data);
if( !view.getFilterItem().$element.val()
&& view.parsedFilterMode === view.configModel.FILTER_MODE_ASSISTED
) {
view.configModel.requestWizard(view.getFilterItem().keyName)
}
} else if (payload.feature === view.getGroupsItem().featureName) {
if(view.manyGroupsSupport && payload.data.length > view._groupElementSwitchThreshold) {
// we need to fill the left list box, excluding the values

+ 3
- 0
apps/user_ldap/js/wizard/wizardTabLoginFilter.js View File

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

/**

Loading…
Cancel
Save