From 370c4656ec91027b991de6e8c0b5fd198b14aa63 Mon Sep 17 00:00:00 2001 From: znek Date: Thu, 14 Dec 2006 14:56:16 +0000 Subject: [PATCH] bugfix for edge case use of 'count' without other bindings in repetitions. git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1391 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 5 +++++ sope-appserver/NGObjWeb/DynamicElements/WORepetition.m | 2 +- sope-appserver/NGObjWeb/Version | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index b00e2c83..90ac6db2 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,8 @@ +2006-12-14 Marcus Mueller + + * DynamicElements/WORepetition.m: fixed a bug when using count without + index and list (v4.5.260) + 2006-12-13 Helge Hess * Templates/WOHTMLParser.m: fixed a bug with lowercase NAME tags in diff --git a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m index 561668b4..96a47386 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m @@ -533,7 +533,7 @@ _applyIndex(_WOComplexRepetition *self, WOComponent *sComponent, unsigned _idx) [self->item setValue:lItem inComponent:sComponent]; } else { - if (!self->index) { + if (!self->index && self->list) { [_ctx pushCursor:lItem]; } } diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index ab4142c7..2866b4a3 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -3,7 +3,7 @@ ifeq ($(GNUSTEP_HOST_VENDOR),apple) # linker overflow SUBMINOR_VERSION:=255 else -SUBMINOR_VERSION:=259 +SUBMINOR_VERSION:=260 endif # v4.5.234 requires libDOM v4.5.21 -- 2.39.5