SVN: CMF/trunk/C Restored ZMI Cache tab for File and Image which got lost in CMF 1.6.

Log message for revision 71300:
  Restored ZMI Cache tab for File and Image which got lost in CMF 1.6.
  

Changed:
  U   CMF/trunk/CHANGES.txt
  U   CMF/trunk/CMFDefault/File.py
  U   CMF/trunk/CMFDefault/Image.py

-=-
Modified: CMF/trunk/CHANGES.txt
===================================================================
--- CMF/trunk/CHANGES.txt	2006-11-24 04:32:24 UTC (rev 71299)
+++ CMF/trunk/CHANGES.txt	2006-11-24 11:38:03 UTC (rev 71300)
@@ -1,6 +1,11 @@
 CMF 2.1.0-beta (unreleased)
 
+  Bug Fixes
 
+    - CMFDefault.File and CMFDefault.Image: Restored ZMI Cache tab which was
+      lost in CMF 1.6.
+
+
 CMF 2.1.0-alpha2 (2006/11/23)
 
   New Features

Modified: CMF/trunk/CMFDefault/File.py
===================================================================
--- CMF/trunk/CMFDefault/File.py	2006-11-24 04:32:24 UTC (rev 71299)
+++ CMF/trunk/CMFDefault/File.py	2006-11-24 11:38:03 UTC (rev 71300)
@@ -22,6 +22,7 @@
 from Globals import InitializeClass
 from zope.component.factory import Factory
 from zope.interface import implements
+from OFS.Cache import Cacheable
 
 from Products.CMFCore.PortalContent import PortalContent
 from Products.CMFCore.utils import _OldCacheHeaders
@@ -88,6 +89,10 @@
     _isDiscussable = 1
     icon = PortalContent.icon
 
+    manage_options = ( PortalContent.manage_options
+                     + Cacheable.manage_options
+                     )
+
     security = ClassSecurityInfo()
 
     def __init__( self

Modified: CMF/trunk/CMFDefault/Image.py
===================================================================
--- CMF/trunk/CMFDefault/Image.py	2006-11-24 04:32:24 UTC (rev 71299)
+++ CMF/trunk/CMFDefault/Image.py	2006-11-24 11:38:03 UTC (rev 71300)
@@ -21,6 +21,7 @@
 from Globals import InitializeClass
 from zope.component.factory import Factory
 from zope.interface import implements
+from OFS.Cache import Cacheable
 
 from Products.CMFCore.PortalContent import PortalContent
 from Products.CMFCore.utils import _OldCacheHeaders
@@ -86,6 +87,10 @@
     _isDiscussable = 1
     icon = PortalContent.icon
 
+    manage_options = ( PortalContent.manage_options
+                     + Cacheable.manage_options
+                     )
+
     security = ClassSecurityInfo()
 
     def __init__( self