Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

- Remove mouse scroll settings of already removed custom scrollbar.

Browse source 
- Add setting OAUTH2_ADFS_ENABLED=false
- Add testing for both string and boolean version of true

Thanks to xet7 !

Fixes #2949
This commit is contained in:
Lauri Ojansivu 2020-09-13 09:41:53 +03:00
parent 67a58daaf3
commit f6bdb4d694
13 changed files with 458 additions and 478 deletions
Download patch file Download diff file Expand all files Collapse all files

15
models/settings.js
View file

@ -187,19 +187,26 @@ if (Meteor.isServer) {
}
function isLdapEnabled() {
return process.env.LDAP_ENABLE === 'true';
return (
process.env.LDAP_ENABLE === 'true' || process.env.LDAP_ENABLE === true
);
}
function isOauth2Enabled() {
return process.env.OAUTH2_ENABLED === 'true';
return (
process.env.OAUTH2_ENABLED === 'true' ||
process.env.OAUTH2_ENABLED === true
);
}
function isCasEnabled() {
return process.env.CAS_ENABLED === 'true';
return (
process.env.CAS_ENABLED === 'true' || process.env.CAS_ENABLED === true
);
}
function isApiEnabled() {
return process.env.WITH_API === 'true';
return process.env.WITH_API === 'true' || process.env.WITH_API === true;
}
Meteor.methods({