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.
Alinto · Nov 18, 2019 · 14b60cd · 14b60cd
1 parent 9c299cf
commit 14b60cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/UI/PreferencesUI/UIxJSONPreferences.m b/UI/PreferencesUI/UIxJSONPreferences.m
@@ -365,6 +365,10 @@ - (NSString *) jsonDefaults
   [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:

diff --git a/UI/WebServerResources/js/Scheduler/Attendees.service.js b/UI/WebServerResources/js/Scheduler/Attendees.service.js
@@ -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;