[Erp5-report] r35864 kazuhiko - in /erp5/trunk/products: ERP5/Document/ ERP5Type/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Jun  1 15:23:47 2010
New Revision: 35864

URL: http://svn.erp5.org?rev=35864&view=rev
Log:
revert r35858 and r35859, that requires more discussion.

Modified:
    erp5/trunk/products/ERP5/Document/Delivery.py
    erp5/trunk/products/ERP5Type/Base.py

Modified: erp5/trunk/products/ERP5/Document/Delivery.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Delivery.py?rev=35864&r1=35863&r2=35864&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Delivery.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Delivery.py [utf8] Tue Jun  1 15:23:47 2010
@@ -707,7 +707,7 @@
 
       # only expand if we are not in a "too early" or "too late" state
       if (self.getSimulationState() in
-          self.getGroupedStateList('draft_order')):
+          self.getPortalDraftOrderStateList()):
         return
 
       portal_rules = getToolByName(self, 'portal_rules')

Modified: erp5/trunk/products/ERP5Type/Base.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Base.py?rev=35864&r1=35863&r2=35864&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Base.py [utf8] Tue Jun  1 15:23:47 2010
@@ -3801,41 +3801,6 @@
   def isItem(self):
     return self.portal_type in self.getPortalItemTypeList()
 
-  security.declareProtected(Permissions.AccessContentsInformation,
-                            'getGroupedStateList')
-  def getGroupedStateList(self, group):
-    """
-    Return a list of workflow states classified to a specific group.
-    """
-    portal_type = self.getPortalType()
-
-    def getStateList(portal_type, group):
-      state_dict = {}
-      portal_workflow = self.getPortalObject().portal_workflow
-      wf_id_list = portal_workflow.getChainFor(portal_type)
-      for wf_id in wf_id_list:
-        states = getattr(portal_workflow[wf_id], 'states', None)
-        if states is not None:
-          for state in states.objectValues():
-            if group in getattr(state, 'type_list', ()):
-              state_dict[state.getId()] = None
-      return tuple(state_dict.keys())
-
-    getStateList = CachingMethod(
-      getStateList,
-      id=('_getPortalGroupedStateList', portal_type, group),
-      cache_factory='erp5_content_medium')
-
-    state_list = getStateList(portal_type, group)
-    if len(state_list) == 0:
-      # If we cannot get state list from this portal type's workflow
-      # chain, try to get from the portal.
-      portal = self.getPortalObject()
-      state_list = portal._getPortalGroupedStateList(group) or \
-          portal._getPortalConfiguration('portal_%s_state_list' % group)
-
-    return state_list
-
 InitializeClass(Base)
 
 try: