fixed an invokeAction issue in the switch-component

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1168 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 0599addda165d2a847ac42a946d2aa67a3bf4d39..5a91c5d146be4f43bea3f7659f9176198284b529 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-16  Jean-Alexis Montignies  <ja@sente.ch>
+
+       * DynamicElements/WOSwitchComponent.m: properly consume element-id
+         component in -invokeAction: (OGo bug #1590) (v4.5.209)
+
 2005-10-06  Helge Hess  <helge.hess@opengroupware.org>
 
        * 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 eaa06f29c30eeee006cd55bc24bc075dbeafaae0..e133e63538ca756c1dc2bba4d01676277eb03118 100644 (file)
--- 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 b3a4b99dcde9f3f4264c8e1682053621d5a1ac58..b80e40c673743226d5d4e130382b8ba51a353023 100644 (file)
--- 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