From 1211ec78a1bcc6d28ad2d019e510b0425fe871dd Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 15 Jul 2010 16:40:26 +0000 Subject: [PATCH] Monotone-Parent: d486d5e829cf0bc377649b3e2d2ecfcc08afb8e8 Monotone-Revision: eb91760e130971e6a1b43251bf762b23a408ab34 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-07-15T16:40:26 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ UI/WebServerResources/UIxAppointmentEditor.js | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a4899045..2f419ec4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-07-15 Wolfgang Sourdeau + * UI/WebServerResources/UIxAppointmentEditor.js + (onComposeToAllAttendees): take the status image DIV into account + when detecting the user fullnames. + * Tests/Integration/test-davacl.py (DAVCalendarPublicAclTest.testCollectionAccessNormalUser): print the amount of received hrefs. diff --git a/UI/WebServerResources/UIxAppointmentEditor.js b/UI/WebServerResources/UIxAppointmentEditor.js index b1700d83b..1dddfe991 100644 --- a/UI/WebServerResources/UIxAppointmentEditor.js +++ b/UI/WebServerResources/UIxAppointmentEditor.js @@ -115,8 +115,15 @@ function onComposeToAllAttendees() var attendees = $$("DIV#attendeesMenu LI.attendee"); var addresses = new Array(); attendees.each(function(item) { - var address = item.firstChild.nodeValue.trim() + " <" + item.readAttribute("email") + ">"; - addresses.push(address); + var textChild = null; + var childNodes = item.childNodes; + for (var i = 0; !textChild && i < childNodes.length; i++) { + if (childNodes[i].nodeType == 3) { + textChild = childNodes[i]; + var address = textChild.nodeValue.trim() + " <" + item.readAttribute("email") + ">"; + addresses.push(address); + } + } }); if (window.opener) window.opener.openMailTo(addresses.join(","));