From 94efd85764db009d7d2f066aac5e08a0a0e72c82 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 27 Oct 2011 18:50:42 +0000 Subject: [PATCH] See ChangeLog. Monotone-Parent: 826c26c2f6f34d0cea46bfa5fc4827ec833f3b9d Monotone-Revision: f094ea8727e7110bffdeac78126137ceea63eda5 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-10-27T18:50:42 --- ChangeLog | 5 +++++ UI/WebServerResources/UIxAttendeesEditor.js | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 973be8575..7cf71dc23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2011-10-27 Francis Lachapelle + * UI/WebServerResources/UIxAttendeesEditor.js + (performSearchCallback): show a list email address (usually an + LDAP group) unless the list has no email address (usually a + personal contacts list). + * UI/WebServerResources/SOGoRootPage.js (initLogin): added sliding effect to about box. diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js index e5806ed3b..af7faf682 100644 --- a/UI/WebServerResources/UIxAttendeesEditor.js +++ b/UI/WebServerResources/UIxAttendeesEditor.js @@ -41,8 +41,8 @@ function resolveListAttendees(input, append) { } function resolveListAttendeesCallback(http) { + var input = http.callbackData["input"]; if (http.readyState == 4 && http.status == 200) { - var input = http.callbackData["input"]; var append = http.callbackData["append"]; var contacts = http.responseText.evalJSON(true); for (var i = 0; i < contacts.length; i++) { @@ -85,6 +85,10 @@ function resolveListAttendeesCallback(http) { } } } + else { + // List not found (probably an LDAP group) + performSearch(input); + } } function onContactKeydown(event) { @@ -205,7 +209,7 @@ function performSearchCallback(http) { var isList = (contact["c_component"] && contact["c_component"] == "vlist"); var completeEmail = contact["c_cn"].trim(); - if (!isList) { + if (contact["c_mail"]) { if (completeEmail) completeEmail += " <" + contact["c_mail"] + ">"; else @@ -276,7 +280,7 @@ function performSearchCallback(http) { input.container = contact["container"]; } var completeEmail = contact["c_cn"].trim(); - if (!isList) { + if (contact["c_mail"]) { if (completeEmail) completeEmail += " <" + contact["c_mail"] + ">"; else