[Erp5-report] r35366 yo - /erp5/trunk/products/ERP5Type/Core/Folder.py

[nobody at svn.erp5.org]

Author: yo
Date: Sat May 15 06:41:00 2010
New Revision: 35366

URL: http://svn.erp5.org?rev=35366&view=rev
Log:
If the user can manage the portal, do not hide any content types.

Modified:
    erp5/trunk/products/ERP5Type/Core/Folder.py

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=35366&r1=35365&r2=35366&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py [utf8] Sat May 15 06:41:00 2010
@@ -28,7 +28,7 @@
 ##############################################################################
 
 import transaction
-from AccessControl import ClassSecurityInfo
+from AccessControl import ClassSecurityInfo, getSecurityManager
 from Acquisition import aq_base, aq_parent, aq_inner
 from OFS.History import Historical
 import ExtensionClass
@@ -44,6 +44,7 @@
 from Products.ERP5Type.XMLExportImport import Folder_asXML
 from Products.ERP5Type.Utils import sortValueList
 from Products.ERP5Type.WebDAVSupport import Folder as WebDAVFolder
+from Products.ERP5Type import Permissions
 
 try:
   from Products.CMFCore.CMFBTreeFolder import CMFBTreeFolder
@@ -1308,6 +1309,11 @@
     """
     portal = self.getPortalObject()
 
+    # If the user can manage the portal, do not hide any content types.
+    sm = getSecurityManager()
+    if sm.checkPermission(Permissions.ManagePortal, portal):
+      return [ti.id for ti in self.allowedContentTypes()]
+
     hidden_type_list = portal.portal_types.getTypeInfo(self)\
                                               .getTypeHiddenContentTypeList()
     return [ ti.id for ti in self.allowedContentTypes()