See ChangeLog.
Monotone-Parent: 826c26c2f6f34d0cea46bfa5fc4827ec833f3b9d Monotone-Revision: f094ea8727e7110bffdeac78126137ceea63eda5 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-10-27T18:50:42maint-2.0.2
parent
8b66f12225
commit
94efd85764
|
@ -1,5 +1,10 @@
|
|||
2011-10-27 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
* 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.
|
||||
|
||||
|
|
|
@ -41,8 +41,8 @@ function resolveListAttendees(input, append) {
|
|||
}
|
||||
|
||||
function resolveListAttendeesCallback(http) {
|
||||
if (http.readyState == 4 && http.status == 200) {
|
||||
var input = http.callbackData["input"];
|
||||
if (http.readyState == 4 && http.status == 200) {
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue