Skip to content
Browse files

revert 12028e2, which filtered out the wrong set of types

  • Loading branch information...
1 parent b12fefc commit f0e26bce11553f88eb0a49117c0d3d9d41c71ccc @davisagli davisagli committed
Showing with 6 additions and 3 deletions.
  1. +1 −3 Products/CMFPlone/skins/plone_content/folder_listing.pt
  2. +5 −0 docs/CHANGES.txt
View
4 Products/CMFPlone/skins/plone_content/folder_listing.pt
@@ -28,13 +28,11 @@
<metal:listingmacro define-macro="listing">
<tal:foldercontents define="contentFilter contentFilter|request/contentFilter|nothing;
- contentFilter python:contentFilter and dict(contentFilter) or {};
+ contentFilter python:contentFilter and dict(contentFilter) or {};
limit_display limit_display|request/limit_display|nothing;
limit_display python:limit_display and int(limit_display) or None;
more_url more_url|request/more_url|string:folder_contents;
is_a_topic python:context.portal_type=='Topic';
- friendly_types context/@@plone_portal_state/friendly_types;
- dummy python:not is_a_topic and contentFilter.setdefault('portal_type', friendly_types);
folderContents folderContents|nothing; folderContents python:folderContents or is_a_topic and context.queryCatalog(batch=True, **contentFilter) or context.getFolderContents(contentFilter, batch=True, b_size=limit_display or 100);
site_properties context/portal_properties/site_properties;
use_view_action site_properties/typesUseViewActionInListings|python:();
View
5 docs/CHANGES.txt
@@ -8,6 +8,11 @@ Changelog
4.2b3 (unreleased)
------------------
+- Stop filtering folder_listing to the types from
+ @@plone_portal_state/friendly_types, since that excludes non-searchable
+ types rather than non-listable types.
+ [davisagli]
+
- PloneControlPanel's enumConfiglets no longer returns invisible configlets.
[esteele]

0 comments on commit f0e26bc

Please sign in to comment.
Something went wrong with that request. Please try again.