From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 13 Aug 2004 14:47:36 +0000 (+0000)
Subject: important fix
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c5394137c15ad75c94773fa0544db4b6698ba79;p=scalable-opengroupware.org

important fix

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@201 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index ffa35b25..70ee802b 100644
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-13  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* UIxAppointmentEditor.[wox|m]: important fix for testing (v0.9.30)
+
 2004-08-13    <helge@agenor.opengroupware.org>
 
 	* UIxCalWeekOverview.wox: hide weekend (requires libWEExtensions 
diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index 169a123d..36d4da4a 100644
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
@@ -243,6 +243,18 @@
     return [NSString stringWithFormat:@"%@@equipement.gouv.fr", uid];
 }
 
+- (NSString *)combinedCNAndEmailForUser {
+    return [NSString stringWithFormat:@"%@;%@",
+        [self emailForUser],
+        [self shortUserNameForDisplay]];
+}
+
+- (NSString *)combinedCNAndEmail {
+    return [NSString stringWithFormat:@"%@;%@",
+        [self->item rfc822Email],
+        [self->item cnForDisplay]];
+}
+
 
 /* new */
 
diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
index 1920835f..e054b63c 100644
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
@@ -141,7 +141,7 @@
                       <tr>
                         <td><input type="checkbox"
                                    checked="YES"
-                                   var:value="cnAndEmailForUser"
+                                   var:value="combinedCNAndEmailForUser"
                                    var:id="emailForUser"
                                    name="participants"
                             /></td>
diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 459766da..5d303cb1 100644
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,5 +1,5 @@
 # $Id$
 
-SUBMINOR_VERSION:=29
+SUBMINOR_VERSION:=30
 
 # v0.9.29 requires libWEExtensions v4.2.51