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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index b00e2c835da9a7587e2112a050ec6a88d24d664e..90ac6db20bbfea58008ee9be7fb2019e6dfaa46f 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-14  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * DynamicElements/WORepetition.m: fixed a bug when using count without
+         index and list (v4.5.260)
+
 2006-12-13  Helge Hess  <helge.hess@opengroupware.org>
 
        * 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 561668b43fef164f621996b8b8a8ffdc6a0dbc48..96a47386b6cc60234f11a733307a3a496f4eacbc 100644 (file)
--- 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 ab4142c726fe1461a133883ea1f3a671896a1e2f..2866b4a36e761b9087948ea0f4537210c1c884a8 100644 (file)
--- 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