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

make scrutinizer happier and always count users on assisted mode, even with xp'ed mode (would be a regression otherwise)

This commit is contained in:
Arthur Schiwon 2014-11-22 00:51:41 +01:00
parent 503de94392
commit 9aef83b579
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/user_ldap/js/ldapFilter.js
View File

@ -26,10 +26,10 @@ LdapFilter.prototype.activate = function() {
this.determineMode(); this.determineMode();
}; };
LdapFilter.prototype.compose = function(updateCount = false) { LdapFilter.prototype.compose = function(updateCount) {
var action; var action;
if(updateCount) { if(updateCount === true) {
this.countPending = updateCount; this.countPending = updateCount;
} }

8
apps/user_ldap/js/settings.js
View File

@ -812,7 +812,7 @@ var LdapWizard = {
LdapWizard._save($('#'+originalObj)[0], $.trim(values)); LdapWizard._save($('#'+originalObj)[0], $.trim(values));
if(originalObj === 'ldap_userfilter_objectclass' if(originalObj === 'ldap_userfilter_objectclass'
|| originalObj === 'ldap_userfilter_groups') { || originalObj === 'ldap_userfilter_groups') {
LdapWizard.userFilter.compose(!LdapWizard.admin.isExperienced()); LdapWizard.userFilter.compose(true);
//when user filter is changed afterwards, login filter needs to //when user filter is changed afterwards, login filter needs to
//be adjusted, too //be adjusted, too
if(!LdapWizard.loginFilter) { if(!LdapWizard.loginFilter) {
@ -823,7 +823,7 @@ var LdapWizard = {
LdapWizard.loginFilter.compose(); LdapWizard.loginFilter.compose();
} else if(originalObj === 'ldap_groupfilter_objectclass' } else if(originalObj === 'ldap_groupfilter_objectclass'
|| originalObj === 'ldap_groupfilter_groups') { || originalObj === 'ldap_groupfilter_groups') {
LdapWizard.groupFilter.compose(!LdapWizard.admin.isExperienced()); LdapWizard.groupFilter.compose(true);
} }
}, },
@ -893,10 +893,10 @@ var LdapWizard = {
LdapWizard._save({ id: modeKey }, LdapWizard.filterModeAssisted); LdapWizard._save({ id: modeKey }, LdapWizard.filterModeAssisted);
if(isUser) { if(isUser) {
LdapWizard.blacklistRemove('ldap_userlist_filter'); LdapWizard.blacklistRemove('ldap_userlist_filter');
LdapWizard.userFilter.compose(!LdapWizard.admin.isExperienced()); LdapWizard.userFilter.compose(true);
} else { } else {
LdapWizard.blacklistRemove('ldap_group_filter'); LdapWizard.blacklistRemove('ldap_group_filter');
LdapWizard.groupFilter.compose(!LdapWizard.admin.isExperienced()); LdapWizard.groupFilter.compose(true);
} }
} }
}, },