[kupu-checkins] r43522 - in kupu/trunk/kupu/plone: kupu_plone_layer profiles/default

[duncan at codespeak.net]

Author: duncan
Date: Mon May 21 12:28:03 2007
New Revision: 43522

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
   kupu/trunk/kupu/plone/profiles/default/kupu.xml
Log:
Fix for Plone ticket #6598: Default linkables in Kupu: folder is not, plone site is not, ATRelativePathCriterion is


Modified: kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py	Mon May 21 12:28:03 2007
@@ -13,11 +13,38 @@
 # preferred kupu configuration.
 from Products.CMFCore.utils import getToolByName
 
+LINKABLE_BLACKLIST = (
+    'ATBooleanCriterion',
+    'ATCurrentAuthorCriterion',
+    'ATDateCriteria',
+    'ATDateRangeCriterion',
+    'ATListCriterion',
+    'ATPathCriterion',
+    'ATPortalTypeCriterion',
+    'ATReferenceCriterion',
+    'ATRelativePathCriterion',
+    'ATSelectionCriterion',
+    'ATSimpleIntCriterion',
+    'ATSimpleStringCriterion',
+    'ATSortCriterion',
+    'ChangeSet',
+    'CMF Document',
+    'CMF Event',
+    'CMF Favorite',
+    'CMF File',
+    'CMF Image',
+    'CMF Link',
+    'CMF News Item',
+    'Discussion Item',
+    'Favorite',
+    'Link',
+    'TempFolder',
+)
 RESOURCES = dict(
-    linkable = ('Document', 'Image', 'File', 'News Item', 'Event', 'Folder', 'Large Plone Folder'),
-    mediaobject = ('Image',),
-    collection = ('Plone Site', 'Folder', 'Large Plone Folder'),
-    containsanchors = ('Document', 'News Item', 'Event'),
+    linkable = ('blacklist', LINKABLE_BLACKLIST),
+    mediaobject = ('whitelist', ('Image',)),
+    collection = ('whitelist', ('Plone Site', 'Folder', 'Large Plone Folder')),
+    containsanchors = ('whitelist', ('Document', 'News Item', 'Event')),
     )
 
 EXCLUDED_HTML = [
@@ -126,8 +153,8 @@
 tool.deleteResourceTypes([ t.name for t in types])
 
 print "add resources"
-for k,v in RESOURCES.items():
-    tool.addResourceType(k, typefilter(v))
+for k,(mode,types) in RESOURCES.items():
+    tool.addResourceType(k, typefilter(types), mode=mode)
 
 mappings = tool.zmi_get_resourcetypes()
 for t in mappings:

Modified: kupu/trunk/kupu/plone/profiles/default/kupu.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/kupu.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/kupu.xml	Mon May 21 12:28:03 2007
@@ -83,7 +83,6 @@
     <type>Image</type>
     <type>Large Plone Folder</type>
     <type>Link</type>
-    <type>Plone Site</type>
     <type>TempFolder</type>
     <type>Topic</type>
   </resource>
@@ -96,10 +95,12 @@
     <type>ATPathCriterion</type>
     <type>ATPortalTypeCriterion</type>
     <type>ATReferenceCriterion</type>
+    <type>ATRelativePathCriterion</type>
     <type>ATSelectionCriterion</type>
     <type>ATSimpleIntCriterion</type>
     <type>ATSimpleStringCriterion</type>
     <type>ATSortCriterion</type>
+    <type>ChangeSet</type>
     <type>CMF Document</type>
     <type>CMF Event</type>
     <type>CMF Favorite</type>
@@ -109,7 +110,6 @@
     <type>CMF News Item</type>
     <type>Discussion Item</type>
     <type>Favorite</type>
-    <type>Folder</type>
     <type>Link</type>
     <type>Plone Site</type>
     <type>TempFolder</type>