[CMF-checkins] CVS: Products/CMFDefault - Document.py:1.70 DublinCore.py:1.39 File.py:1.32 Image.py:1.31 Link.py:1.33

[Yvo Schubbe]

Update of /cvs-repository/Products/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv4771/CMFDefault

Modified Files:
	Document.py DublinCore.py File.py Image.py Link.py 
Log Message:
- removed WorkflowMethod wrappers
- marked WorkflowMethod deprecated on CMF-1_5-branch and removed it on the HEAD


=== Products/CMFDefault/Document.py 1.69 => 1.70 ===
--- Products/CMFDefault/Document.py:1.69	Thu Aug 12 11:07:40 2004
+++ Products/CMFDefault/Document.py	Tue Aug 24 17:12:58 2004
@@ -152,7 +152,6 @@
             , safety_belt=''
             ):
         """
-        *used to be WorkflowAction(_edit)
         To add webDav support, we need to check if the content is locked, and if
         so return ResourceLockedError if not, call _edit.
 


=== Products/CMFDefault/DublinCore.py 1.38 => 1.39 ===
--- Products/CMFDefault/DublinCore.py:1.38	Thu Aug 12 11:07:40 2004
+++ Products/CMFDefault/DublinCore.py	Tue Aug 24 17:12:58 2004
@@ -468,7 +468,6 @@
                    , rights=''
                     ):
         """
-        used to be:  editMetadata = WorkflowAction(_editMetadata)
         Need to add check for webDAV locked resource for TTW methods.
         """
         # as per bug #69, we cant assume they use the webdav


=== Products/CMFDefault/File.py 1.31 => 1.32 ===
--- Products/CMFDefault/File.py:1.31	Thu Aug 12 11:07:40 2004
+++ Products/CMFDefault/File.py	Tue Aug 24 17:12:58 2004
@@ -21,7 +21,6 @@
 from AccessControl import ClassSecurityInfo
 
 from Products.CMFCore.PortalContent import PortalContent
-from Products.CMFCore.WorkflowCore import WorkflowAction
 
 from DublinCore import DefaultDublinCoreImpl
 from permissions import View
@@ -217,8 +216,6 @@
         """ Update and reindex. """
         self._edit( precondition, file )
         self.reindexObject()
-
-    edit = WorkflowAction(edit)
 
     security.declareProtected(View, 'download')
     def download(self, REQUEST, RESPONSE):


=== Products/CMFDefault/Image.py 1.30 => 1.31 ===
--- Products/CMFDefault/Image.py:1.30	Thu Aug 12 11:07:40 2004
+++ Products/CMFDefault/Image.py	Tue Aug 24 17:12:58 2004
@@ -20,7 +20,6 @@
 from AccessControl import ClassSecurityInfo
 
 from Products.CMFCore.PortalContent import PortalContent
-from Products.CMFCore.WorkflowCore import WorkflowAction
 
 from DublinCore import DefaultDublinCoreImpl
 from permissions import View
@@ -209,8 +208,6 @@
         """ Update and reindex. """
         self._edit( precondition, file )
         self.reindexObject()
-
-    edit = WorkflowAction(edit)
 
     security.declareProtected(View, 'index_html')
     def index_html(self, REQUEST, RESPONSE):


=== Products/CMFDefault/Link.py 1.32 => 1.33 ===
--- Products/CMFDefault/Link.py:1.32	Thu Aug 12 11:07:40 2004
+++ Products/CMFDefault/Link.py	Tue Aug 24 17:12:58 2004
@@ -22,7 +22,6 @@
 from webdav.Lockable import ResourceLockedError
 
 from Products.CMFCore.PortalContent import PortalContent
-from Products.CMFCore.WorkflowCore import WorkflowAction
 from Products.CMFCore.utils import keywordsplitter
 from Products.CMFCore.utils import contributorsplitter
 
@@ -151,8 +150,6 @@
         """ Update and reindex. """
         self._edit( remote_url )
         self.reindexObject()
-
-    edit = WorkflowAction( edit )
 
     security.declareProtected(View, 'SearchableText')
     def SearchableText(self):