From 63782c9d2379c0a87abaca3e7bc33832a91f6816 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 7 Feb 2012 10:13:17 +0000 Subject: [PATCH] See ChangeLog. Monotone-Parent: 1bf26558a5d80739db6bafed963516c4e78f4d6b Monotone-Revision: e44d4b3b819cc0be31ab350c503dde9185890fbe Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-02-07T10:13:17 --- ChangeLog | 7 +++++++ UI/WebServerResources/UIxAttendeesEditor.js | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index efe52cda0..237b69267 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-02-08 Francis Lachapelle + + * UI/WebServerResources/UIxAttendeesEditor.js + (performSearchCallback): set the uid parameter to null instead of + an empty string when the returned contact has no uid (ie, it comes + from a personal addressbook). + 2012-02-06 Wolfgang Sourdeau * SoObjects/SOGo/LDAPSource.m: escape built DNs using the new diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js index bdf494de3..2753cc35b 100644 --- a/UI/WebServerResources/UIxAttendeesEditor.js +++ b/UI/WebServerResources/UIxAttendeesEditor.js @@ -219,7 +219,10 @@ function performSearchCallback(http) { list.appendChild(node); node.address = completeEmail; // log("node.address: " + node.address); - node.uid = (contact["isMSExchange"]? UserLogin + ":" : "") + contact["c_uid"]; + if (contact["c_uid"]) + node.uid = (contact["isMSExchange"]? UserLogin + ":" : "") + contact["c_uid"]; + else + node.uid = null; node.isList = isList; if (isList) { node.cname = contact["c_name"]; @@ -272,7 +275,10 @@ function performSearchCallback(http) { if (data.contacts.length == 1) { // Single result var contact = data.contacts[0]; - input.uid = (contact["isMSExchange"]? UserLogin + ":" : "") + contact["c_uid"]; + if (contact["c_uid"]) + input.uid = (contact["isMSExchange"]? UserLogin + ":" : "") + contact["c_uid"]; + else + input.uid = null; var isList = (contact["c_component"] && contact["c_component"] == "vlist"); if (isList) {