fixed DELETEAction: to return a proper bool result

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

diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index fb88c3e1023970c4bf636c33cc9eda5a69b3dc28..4d58dff1d40b452a57c4b9d1b9a18d9ee989511b 100644 (file)
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-25  Helge Hess  <helge.hess@opengroupware.org>
+
+       * SOGoObject.m: fixed DELETEAction to return a boolean if the delete
+         was successful (required by SoObjectRequestHandler) (v0.9.35)
+
 2005-03-20  Helge Hess  <helge.hess@opengroupware.org>
 
        * changed to use GDLContentStore (v0.9.34)

diff --git a/SOGo/SoObjects/SOGo/SOGoObject.m b/SOGo/SoObjects/SOGo/SOGoObject.m
index 23a2dd824ca4e2b85418106d58ccfc8f519d3cad..f29e295b97fa07ebfbd5af90341114edf9935b7d 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoObject.m
+++ b/SOGo/SoObjects/SOGo/SOGoObject.m
@@ -134,7 +134,13 @@
 /* actions */
 
 - (id)DELETEAction:(id)_ctx {
-  return [self delete];
+  NSException *error;
+
+  if ((error = [self delete]) != nil)
+    return error;
+  
+  /* Note: returning 'nil' breaks in SoObjectRequestHandler */
+  return [NSNumber numberWithBool:YES]; /* delete worked out ... */
 }
 
 - (id)GETAction:(id)_ctx {

diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index 495213fae55216ea44dcf54aecdf6f8e702d004d..9beb87e381326409fea9ee7662bfcd5a91987f2f 100644 (file)
--- a/SOGo/SoObjects/SOGo/Version
+++ b/SOGo/SoObjects/SOGo/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=34
+SUBMINOR_VERSION:=35
 
 # v0.9.34 requires libGDLContentStore v4.5.26
 # v0.9.26 requires libOGoContentStore v0.9.13