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 ffa35b2588eed9e70437a668ebde6638b811939b..70ee802b3bc8e8c2c2770fe70aefa1d0bccb1224 100644 (file)
--- 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 169a123dfea0b65a15f8d960d54a0a525b97e93f..36d4da4a9dd93485c1177d3079b9f31d02cb8f0d 100644 (file)
--- 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 1920835f11bf6882d8d31c0e81a71b80019456ed..e054b63c70ca33cc6dbe3919a841192bac28cf60 100644 (file)
--- 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 459766dab433912c17dd2a46e20c7cbc9288971e..5d303cb129d47f8bab7a1434e0860ec75e8b486e 100644 (file)
--- 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