summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/js
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2014-11-22 00:51:41 +0100
committerArthur Schiwon <blizzz@owncloud.com>2014-11-22 00:51:41 +0100
commit9aef83b5798733d718e03a4ef0edc7279db43e59 (patch)
treee87aa593ec52ac9729c598495e5acaba4a0775ca /apps/user_ldap/js
parent503de94392c0863e29cc8f1a46637f78ce8523ce (diff)
downloadnextcloud-server-9aef83b5798733d718e03a4ef0edc7279db43e59.tar.gz
nextcloud-server-9aef83b5798733d718e03a4ef0edc7279db43e59.zip
make scrutinizer happier and always count users on assisted mode, even with xp'ed mode (would be a regression otherwise)
Diffstat (limited to 'apps/user_ldap/js')
-rw-r--r--apps/user_ldap/js/ldapFilter.js4
-rw-r--r--apps/user_ldap/js/settings.js8
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js
index 4fe8e4aebdf..0f7d240adac 100644
--- a/apps/user_ldap/js/ldapFilter.js
+++ b/apps/user_ldap/js/ldapFilter.js
@@ -26,10 +26,10 @@ LdapFilter.prototype.activate = function() {
this.determineMode();
};
-LdapFilter.prototype.compose = function(updateCount = false) {
+LdapFilter.prototype.compose = function(updateCount) {
var action;
- if(updateCount) {
+ if(updateCount === true) {
this.countPending = updateCount;
}
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 9987f6fd015..6db210fe435 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -812,7 +812,7 @@ var LdapWizard = {
LdapWizard._save($('#'+originalObj)[0], $.trim(values));
if(originalObj === 'ldap_userfilter_objectclass'
|| originalObj === 'ldap_userfilter_groups') {
- LdapWizard.userFilter.compose(!LdapWizard.admin.isExperienced());
+ LdapWizard.userFilter.compose(true);
//when user filter is changed afterwards, login filter needs to
//be adjusted, too
if(!LdapWizard.loginFilter) {
@@ -823,7 +823,7 @@ var LdapWizard = {
LdapWizard.loginFilter.compose();
} else if(originalObj === 'ldap_groupfilter_objectclass'
|| 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);
if(isUser) {
LdapWizard.blacklistRemove('ldap_userlist_filter');
- LdapWizard.userFilter.compose(!LdapWizard.admin.isExperienced());
+ LdapWizard.userFilter.compose(true);
} else {
LdapWizard.blacklistRemove('ldap_group_filter');
- LdapWizard.groupFilter.compose(!LdapWizard.admin.isExperienced());
+ LdapWizard.groupFilter.compose(true);
}
}
},