[Plone-cvs] r21002 - in Products.CMFPlone/trunk/Products/CMFPlone: . skins/plone_content

[Stefan E. <svn...@pl...>]

Author: seletz
Date: Fri May 30 09:21:31 2008
New Revision: 21002

Modified:
   Products.CMFPlone/trunk/Products/CMFPlone/HISTORY.txt
   Products.CMFPlone/trunk/Products/CMFPlone/skins/plone_content/folder_listing.pt
Log:
Add fix for #8159 from 3.1 branch (r21001).

Modified: Products.CMFPlone/trunk/Products/CMFPlone/HISTORY.txt
==============================================================================
--- Products.CMFPlone/trunk/Products/CMFPlone/HISTORY.txt	(original)
+++ Products.CMFPlone/trunk/Products/CMFPlone/HISTORY.txt	Fri May 30 09:21:31 2008
@@ -81,6 +81,10 @@
 
 Plone 3.1.2 - unreleased
 
+    - Apply fix for http://dev.plone.org/plone/ticket/8159. This fixes
+      the event listing of future events. Fix from Sergey Volobuev.
+      [seletz]
+
     - Fix currently selected portal_tab when some actions are linking to 
       external urls. This fixes http://dev.plone.org/plone/ticket/7155.
       [laz]

Modified: Products.CMFPlone/trunk/Products/CMFPlone/skins/plone_content/folder_listing.pt
==============================================================================
--- Products.CMFPlone/trunk/Products/CMFPlone/skins/plone_content/folder_listing.pt	(original)
+++ Products.CMFPlone/trunk/Products/CMFPlone/skins/plone_content/folder_listing.pt	Fri May 30 09:21:31 2008
@@ -44,7 +44,7 @@
                             limit_display limit_display|request/limit_display|nothing;
                             more_url more_url|request/more_url|string:folder_contents;
                             is_a_topic python:here.portal_type=='Topic';
-                            folderContents python:is_a_topic and here.queryCatalog(contentFilter) or here.getFolderContents(contentFilter, batch=True, b_size=limit_display or 100);
+                            folderContents folderContents|nothing; folderContents python:folderContents or is_a_topic and here.queryCatalog(contentFilter) or here.getFolderContents(contentFilter, batch=True, b_size=limit_display or 100);
                             use_view_action site_properties/typesUseViewActionInListings|python:();
                             over_limit python: limit_display and len(folderContents) > limit_display;
                             folderContents python: (over_limit and folderContents[:limit_display]) or folderContents;