From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 25 Mar 2005 22:34:24 +0000 (+0000)
Subject: fixed DELETEAction: to return a proper bool result
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d3f54f187ece970c7cf9183f245ec74717ccbc0;p=scalable-opengroupware.org

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 fb88c3e1..4d58dff1 100644
--- 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 23a2dd82..f29e295b 100644
--- 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 495213fa..9beb87e3 100644
--- 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