[CMF-checkins] SVN: CMF/branches/2.1/C Removed extraneous "Cache" tab from FS-based skin objects.

Tres Seaver tseaver at palladion.com
Thu Jun 7 11:38:17 EDT 2007


Log message for revision 76464:
  Removed extraneous "Cache" tab from FS-based skin objects.
  
   o http://www.zope.org/Collectors/CMF/343
  +
  +    - CMFCore.WorkflowTool: Using the '(Default)' keyword for a type's 
  +      workflow chain will now reset any custom workflow chains for the type
  +      (http://www.zope.org/Collectors/CMF/475)
  

Changed:
  U   CMF/branches/2.1/CHANGES.txt
  U   CMF/branches/2.1/CMFCore/FSDTMLMethod.py
  U   CMF/branches/2.1/CMFCore/FSFile.py
  U   CMF/branches/2.1/CMFCore/FSImage.py
  U   CMF/branches/2.1/CMFCore/FSObject.py
  U   CMF/branches/2.1/CMFCore/FSPageTemplate.py
  U   CMF/branches/2.1/CMFCore/FSPythonScript.py
  U   CMF/branches/2.1/CMFCore/FSZSQLMethod.py

-=-
Modified: CMF/branches/2.1/CHANGES.txt
===================================================================
--- CMF/branches/2.1/CHANGES.txt	2007-06-07 13:24:21 UTC (rev 76463)
+++ CMF/branches/2.1/CHANGES.txt	2007-06-07 15:38:16 UTC (rev 76464)
@@ -2,6 +2,13 @@
 
   Bug Fixes
 
+    - Removed extraneous "Cache" tab from FS-based skin objects
+      http://www.zope.org/Collectors/CMF/343
+
+    - CMFCore.WorkflowTool: Using the '(Default)' keyword for a type's 
+      workflow chain will now reset any custom workflow chains for the type
+      (http://www.zope.org/Collectors/CMF/475)
+
     - Use the property API to get the member specific skin, because
       direct attribute access won't work with PAS based membership.
       (http://dev.plone.org/plone/ticket/5904)

Modified: CMF/branches/2.1/CMFCore/FSDTMLMethod.py
===================================================================
--- CMF/branches/2.1/CMFCore/FSDTMLMethod.py	2007-06-07 13:24:21 UTC (rev 76463)
+++ CMF/branches/2.1/CMFCore/FSDTMLMethod.py	2007-06-07 15:38:16 UTC (rev 76464)
@@ -48,16 +48,12 @@
     _cache_namespace_keys = ()
     _reading = 0
 
-    manage_options=(
-        (
-            {'label':'Customize', 'action':'manage_main'},
-            {'label':'View', 'action':'',
-             'help':('OFSP','DTML-DocumentOrMethod_View.stx')},
-            {'label':'Proxy', 'action':'manage_proxyForm',
-             'help':('OFSP','DTML-DocumentOrMethod_Proxy.stx')},
-            )
-            + Cacheable.manage_options
-        )
+    manage_options=({'label':'Customize', 'action':'manage_main'},
+                    {'label':'View', 'action':'',
+                     'help':('OFSP','DTML-DocumentOrMethod_View.stx')},
+                    {'label':'Proxy', 'action':'manage_proxyForm',
+                     'help':('OFSP','DTML-DocumentOrMethod_Proxy.stx')},
+                   )
 
     security = ClassSecurityInfo()
     security.declareObjectProtected(View)

Modified: CMF/branches/2.1/CMFCore/FSFile.py
===================================================================
--- CMF/branches/2.1/CMFCore/FSFile.py	2007-06-07 13:24:21 UTC (rev 76463)
+++ CMF/branches/2.1/CMFCore/FSFile.py	2007-06-07 15:38:16 UTC (rev 76464)
@@ -45,9 +45,7 @@
     meta_type = 'Filesystem File'
     content_type = 'unknown/unknown'
 
-    manage_options=(
-        {'label':'Customize', 'action':'manage_main'},
-        ) + Cacheable.manage_options
+    manage_options = ({'label':'Customize', 'action':'manage_main'},)
 
     security = ClassSecurityInfo()
     security.declareObjectProtected(View)

Modified: CMF/branches/2.1/CMFCore/FSImage.py
===================================================================
--- CMF/branches/2.1/CMFCore/FSImage.py	2007-06-07 13:24:21 UTC (rev 76463)
+++ CMF/branches/2.1/CMFCore/FSImage.py	2007-06-07 15:38:16 UTC (rev 76464)
@@ -43,9 +43,7 @@
     content_type = 'unknown/unknown'
     _data = None
 
-    manage_options=(
-        {'label':'Customize', 'action':'manage_main'},
-        ) + Cacheable.manage_options
+    manage_options = ({'label':'Customize', 'action':'manage_main'},)
 
     security = ClassSecurityInfo()
     security.declareObjectProtected(View)

Modified: CMF/branches/2.1/CMFCore/FSObject.py
===================================================================
--- CMF/branches/2.1/CMFCore/FSObject.py	2007-06-07 13:24:21 UTC (rev 76463)
+++ CMF/branches/2.1/CMFCore/FSObject.py	2007-06-07 15:38:16 UTC (rev 76464)
@@ -225,9 +225,7 @@
 <dtml-var manage_page_footer>
 """
 
-    manage_options=(
-        {'label':'Error', 'action':'manage_showError'},
-        )
+    manage_options = ({'label':'Error', 'action':'manage_showError'},)
 
     def __init__( self, id, filepath, exc_str=''
                 , fullname=None, properties=None):

Modified: CMF/branches/2.1/CMFCore/FSPageTemplate.py
===================================================================
--- CMF/branches/2.1/CMFCore/FSPageTemplate.py	2007-06-07 13:24:21 UTC (rev 76463)
+++ CMF/branches/2.1/CMFCore/FSPageTemplate.py	2007-06-07 15:38:16 UTC (rev 76464)
@@ -50,13 +50,9 @@
     meta_type = 'Filesystem Page Template'
     _owner = None  # Unowned
 
-    manage_options=(
-        (
-            {'label':'Customize', 'action':'manage_main'},
-            {'label':'Test', 'action':'ZScriptHTML_tryForm'},
-            )
-            + Cacheable.manage_options
-        )
+    manage_options=({'label':'Customize', 'action':'manage_main'},
+                    {'label':'Test', 'action':'ZScriptHTML_tryForm'},
+                   )
 
     security = ClassSecurityInfo()
     security.declareObjectProtected(View)

Modified: CMF/branches/2.1/CMFCore/FSPythonScript.py
===================================================================
--- CMF/branches/2.1/CMFCore/FSPythonScript.py	2007-06-07 13:24:21 UTC (rev 76463)
+++ CMF/branches/2.1/CMFCore/FSPythonScript.py	2007-06-07 15:38:16 UTC (rev 76464)
@@ -94,15 +94,10 @@
     _proxy_roles = ()
     _owner = None  # Unowned
 
-    manage_options=(
-        (
-            {'label':'Customize', 'action':'manage_main'},
-            {'label':'Test',
-             'action':'ZScriptHTML_tryForm',
-             'help': ('PythonScripts', 'PythonScript_test.stx')},
-            )
-            + Cacheable.manage_options
-        )
+    manage_options = ({'label':'Customize', 'action':'manage_main'},
+                      {'label':'Test', 'action':'ZScriptHTML_tryForm',
+                       'help': ('PythonScripts', 'PythonScript_test.stx')},
+                     )
 
     security = ClassSecurityInfo()
     security.declareObjectProtected(View)

Modified: CMF/branches/2.1/CMFCore/FSZSQLMethod.py
===================================================================
--- CMF/branches/2.1/CMFCore/FSZSQLMethod.py	2007-06-07 13:24:21 UTC (rev 76463)
+++ CMF/branches/2.1/CMFCore/FSZSQLMethod.py	2007-06-07 15:38:16 UTC (rev 76464)
@@ -39,13 +39,10 @@
 
     meta_type = 'Filesystem Z SQL Method'
 
-    manage_options=(
-        (
-            {'label':'Customize', 'action':'manage_customise'},
-            {'label':'Test', 'action':'manage_testForm',
-             'help':('ZSQLMethods','Z-SQL-Method_Test.stx')},
-            )
-        )
+    manage_options = ({'label':'Customize', 'action':'manage_customise'},
+                      {'label':'Test', 'action':'manage_testForm',
+                       'help':('ZSQLMethods','Z-SQL-Method_Test.stx')},
+                     )
 
     security = ClassSecurityInfo()
     security.declareObjectProtected(View)



More information about the CMF-checkins mailing list