From d22c36fcf738d8a774dd8d41de23183f7730a0cc Mon Sep 17 00:00:00 2001 From: helge Date: Sun, 16 Oct 2005 23:42:22 +0000 Subject: [PATCH] fixed an invokeAction issue in the switch-component git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1168 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 5 +++++ sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m | 3 ++- sope-appserver/NGObjWeb/Version | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 0599addd..5a91c5d1 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,8 @@ +2005-10-16 Jean-Alexis Montignies + + * DynamicElements/WOSwitchComponent.m: properly consume element-id + component in -invokeAction: (OGo bug #1590) (v4.5.209) + 2005-10-06 Helge Hess * WebDAV/SoObjectWebDAVDispatcher.m: decode XML content of REPORT diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m b/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m index eaa06f29..e133e635 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m @@ -129,7 +129,8 @@ if ((c = [self lookupComponent:cname inContext:_ctx]) == nil) return nil; - + [_ctx consumeElementID]; + [_ctx appendElementIDComponent:cname]; [_ctx enterComponent:c content:self->template]; result = [c invokeActionForRequest:_req inContext:_ctx]; diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index b3a4b99d..b80e40c6 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=208 +SUBMINOR_VERSION:=209 # v4.5.122 requires libNGExtensions v4.5.153 # v4.5.91 requires libNGExtensions v4.5.134 -- 2.39.5