LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(calendar(js)): avoid call to /members when expansion is disabled 

Expose SOGoLDAPGroupExpansionEnabled in /jsonDefaults to avoid a call to
/members when the parameter is disabled.
pull/281/head
Francis Lachapelle 2019-11-18 11:06:15 -05:00
parent 9c299cf0de
commit 14b60cd756
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UI/PreferencesUI/UIxJSONPreferences.m
View File

@ -365,6 +365,10 @@ static SoProduct *preferencesProduct = nil;
[values setObject: [NSNumber numberWithBool: [domainDefaults appointmentSendEMailNotifications]]
forKey: @"SOGoAppointmentSendEMailNotifications"];
// Expose the SOGoLDAPGroupExpansionEnabled configuration parameter from the domain defaults
[values setObject: [NSNumber numberWithBool: [domainDefaults ldapGroupExpansionEnabled]]
forKey: @"SOGoLDAPGroupExpansionEnabled"];
// Add locale code (used by CK Editor)
[values setObject: [locale objectForKey: @"NSLocaleCode"] forKey: @"LocaleCode"];
[values setObject: [NSDictionary dictionaryWithObjectsAndKeys:

2
UI/WebServerResources/js/Scheduler/Attendees.service.js
View File

@ -182,7 +182,7 @@
if (!_.find(this.attendees, function(o) {
return o.email == attendee.email;
})) {
if (card.$isList()) {
if (card.$isList() && Attendees.$Preferences.defaults.SOGoLDAPGroupExpansionEnabled) {
// LDAP list -- preload members
card.$members().then(function(members) {
attendee.members = members;