[CMF-checkins] CVS: CMF/CMFCollector - CHANGES.txt:1.3 Collector.py:1.44 permissions.py:1.5 CollectorPermissions.py:NONE

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCollector
In directory cvs.zope.org:/tmp/cvs-serv2613/CMFCollector

Modified Files:
	CHANGES.txt Collector.py permissions.py 
Removed Files:
	CollectorPermissions.py 
Log Message:
Merged yuppie-post_1_5-cleanup-branch:
- removed a lot of deprecated code
- made CMFCollector work with CMF 1.4 *and* HEAD


=== CMF/CMFCollector/CHANGES.txt 1.2 => 1.3 ===
--- CMF/CMFCollector/CHANGES.txt:1.2	Wed Sep  8 12:28:57 2004
+++ CMF/CMFCollector/CHANGES.txt	Tue Sep 14 15:02:20 2004
@@ -6,7 +6,7 @@
   changes, when necessary.
 
   The file is ordered most recent items first, and the items refer to
-  the collector version as indicated by the VERSION.text file in the
+  the collector version as indicated by the version.txt file in the
   same directory.
 
   See KNOWN_PROBLEMS.txt for pending bugs and problems to beware.
@@ -15,6 +15,8 @@
   Changes after release 0.9b
 
     Bug fixes
+
+      - Improved post CMF 1.5 compatibility.
 
       - Removed imports of WorkflowMethod which broke the product
 


=== CMF/CMFCollector/Collector.py 1.43 => 1.44 ===
--- CMF/CMFCollector/Collector.py:1.43	Wed Sep  8 12:28:12 2004
+++ CMF/CMFCollector/Collector.py	Tue Sep 14 15:02:20 2004
@@ -10,8 +10,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
+""" Implement the Collector issue-container content type.
 
-"""Implement the Collector issue-container content type."""
+$Id$
+"""
 
 import os, urllib
 from DateTime import DateTime
@@ -28,15 +30,16 @@
 
 import util
 
-from permissions import View
-from permissions import AddPortalContent
-from permissions import AccessInactivePortalContent
 from permissions import AccessFuturePortalContent
-from permissions import ViewCollector
+from permissions import AccessInactivePortalContent
 from permissions import AddCollectorIssue
-from permissions import EditCollectorIssue
 from permissions import AddCollectorIssueFollowup
+from permissions import AddPortalContent
+from permissions import EditCollectorIssue
+from permissions import ListFolderContents
 from permissions import ManageCollector
+from permissions import View
+from permissions import ViewCollector
 
 from CollectorIssue import addCollectorIssue, CollectorIssue
 
@@ -69,6 +72,20 @@
                   'name': 'Configure',
                   'action': 'string:${object_url}/collector_edit_form',
                   'permissions': (ManageCollector,)},
+                 {'id': 'folderContents',
+                  'name': 'Folder contents',
+                  'action': 'string:${object_url}/folder_contents',
+                  'permissions': (ListFolderContents,)},
+                 {'id': 'new',
+                  'name': 'New...',
+                  'action': 'string:${object_url}/folder_factories',
+                  'permissions': (AddPortalContent,),
+                  'visible': 0},
+                 {'id': 'rename_items',
+                  'name': 'Rename items',
+                  'action': 'string:${object_url}/folder_rename_form',
+                  'permissions': (AddPortalContent,),
+                  'visible': 0},
                  ),
      },
     )
@@ -414,7 +431,8 @@
         acquires (old workflows controlled this).  This isn't exactly the
         right place, but it is an expedient one."""
 
-        for i in self.objectValues(spec='CMF Collector Issue'):
+        _filter = { 'portal_type': ('Collector Issue',) }
+        for i in self.objectValues(filter=_filter):
 
             # Ensure the issue acquires AddCollectorIssueFollowup
             # and AddPortalContent permissions.


=== CMF/CMFCollector/permissions.py 1.4 => 1.5 ===
--- CMF/CMFCollector/permissions.py:1.4	Wed Aug 25 15:54:20 2004
+++ CMF/CMFCollector/permissions.py	Tue Sep 14 15:02:20 2004
@@ -1,3 +1,15 @@
+##############################################################################
+#
+# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
 """ CMFCollector product permissions
 
 $Id$
@@ -24,6 +36,9 @@
 
 security.declarePublic('AccessFuturePortalContent')
 AccessFuturePortalContent = core_permissions.AccessFuturePortalContent
+
+security.declarePublic('ListFolderContents')
+ListFolderContents = core_permissions.ListFolderContents
 
 security.declarePublic('ModifyPortalContent')
 ModifyPortalContent = core_permissions.ModifyPortalContent

=== Removed File CMF/CMFCollector/CollectorPermissions.py ===