should work, but doesn't properly

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

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 5fbaf8dfff00877be1331c6202cdf1b2804ca999..80aed267c070ddce0c7b737ab64baa347b75eb53 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-12  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.25
+
+       * UIxAppointmentEditor.[m|wox]: participants are added correctly
+         now, resources are still lacking from save.
+
 2004-08-12  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.24

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index c7954755ed8559ad685857bf128fd0d54b95f38c..7f0fe2cb778ed43985675cfc334378e24994eb8f 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
@@ -186,9 +186,9 @@
     @"  checkbox = document.createElement('input');"
     @"  checkbox.setAttribute('type', 'checkbox');"
     @"  checkbox.setAttribute('checked', 'checked');"
-    @"  checkbox.setAttribute('value', '1');"
+    @"  checkbox.setAttribute('value', email);"
     @"  checkbox.setAttribute('id', email);"
-    @"  checkbox.setAttribute('name', email);"
+    @"  checkbox.setAttribute('name', tableId);"
     @"  td.appendChild(checkbox);"
     @"  tr.appendChild(td);"
     @"  td = document.createElement('td');"
@@ -278,6 +278,17 @@
   return date;
 }
 
+- (id)testAction {
+    WORequest      *req;
+    
+    NSLog(@"%s BEEN HERE!",
+          __PRETTY_FUNCTION__);
+
+    req = [[self context] request];
+    NSLog(@"%@", [req formValues]);
+    return self;
+}
+
 - (id)saveAction {
   SOGoAppointment *apt;
   NSString       *iCalString;
@@ -290,12 +301,12 @@
   req = [[self context] request];
 
   /* get iCalString from hidden input */
-  
   iCalString = [req formValueForKey:@"ical"];
   if ([iCalString length] == 0) {
     // TODO: improve user experience ... (eg error panel like Zope)
-    return [NSException exceptionWithHTTPStatus:400 /* bad request */
-                       reason:@"missing iCalendar form data in request"];
+    /* return 400 == Bad Request */
+    return [NSException exceptionWithHTTPStatus:400
+                        reason:@"missing iCalendar form data in request"];
   }
   
   apt = [[SOGoAppointment alloc] initWithICalString:iCalString];
@@ -313,8 +324,7 @@
   [apt setLocation:location];
 
   [apt removeAllAttendees]; /* clean up */
-  ps = [[req formValueForKey:@"participants"]
-            componentsSeparatedByString:@"\n"];
+  ps = [req formValuesForKey:@"participants"];
   count = [ps count];
   for (i = 0; i < count; i++) {
     NSString   *email;

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
index 3c04fdbe52f447c64f0b76b711737acfbc3b4c0e..23e1e024ac1afe3ff7f6cfe0d2e32a9a36a9825f 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
@@ -140,9 +140,11 @@
                     <tr>
                       <td><input type="checkbox"
                                  checked="checked"
-                                 value="1"
+                                 var:value="user.login"
+                                 var:id="user.login"
+                                 name="participants"
                           /></td>
-                      <td>TODO: Owner</td>
+                      <td>TODO: EMAIL(!) <var:string value="user.login" /></td>
                     </tr>
                   </table>
                 </span>
@@ -190,8 +192,9 @@
       </tr>
       <tr>
         <td>
-            <input type="submit" label:value="Save" />
+            <input type="submit" label:value="Save" name="save:method" />
             <input type="hidden" name="ical" var:value="iCalString" />
+            <input type="submit" value="test" name="test:method" />
         </td>
       </tr>
     </table>

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index a281cca1594d733d2ec92e26d77e63bf0f1045e6..8b283eb3b53cdd6a8e556ffea74b87430ca7e635 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=24
+SUBMINOR_VERSION:=25