WorkflowState.py: modify workflow getter since workflow_module has been merged...

WorkflowState.py: modify workflow getter since workflow_module has been merged with portal_workflow.

product/ERP5Type/Accessor/WorkflowState.py

@@ -55,12 +55,12 @@ class Getter(BaseGetter):
       self._key = key
 
     def __call__(self, instance):
-      try:
-        erp5Workflow_module = instance.getPortalObject()._getOb("workflow_module", None)
-        wf = erp5Workflow_module._getOb(self._key)### _getObjectByRef
-      except:
       portal_workflow = instance.getPortalObject().portal_workflow
       wf = portal_workflow.getWorkflowById(self._key)
+      if wf.getPortalType() in ['Workflow', 'Interaction Workflow']:
+        # remove id suffix for workflow and interaction workflow
+        return '_'.join(wf._getWorkflowStateOf(instance, id_only=1).split('_')[0:-1])
+      else:
         return wf._getWorkflowStateOf(instance, id_only=1)
 
     psyco.bind(__call__)
@@ -84,10 +84,6 @@ class TitleGetter(BaseGetter):
       self._key = key
 
     def __call__(self, instance):
-      try:
-        erp5Workflow_module = instance.getPortalObject()._getOb("workflow_module", None)
-        wf = erp5Workflow_module._getOb(self._key)### _getObjectByRef
-      except:
       portal_workflow = instance.getPortalObject().portal_workflow
       wf = portal_workflow.getWorkflowById(self._key)
       return wf._getWorkflowStateOf(instance).getTitle()
@@ -99,12 +95,11 @@ class TranslatedGetter(Getter):
     """
 
     def __call__(self, instance):
-      try:
-        erp5Workflow_module = instance.getPortalObject()._getOb("workflow_module", None)
-        wf = erp5Workflow_module._getOb(self._key)### _getObjectByRef
-      except:
       portal = instance.getPortalObject()
       wf = portal.portal_workflow.getWorkflowById(self._key)
+      if wf.getPortalType() in ['Workflow','Interaction Workflow']:
+        state_id = '_'.join(wf._getWorkflowStateOf(instance, id_only=1).split('_')[0:-1])
+      else:
         state_id = wf._getWorkflowStateOf(instance, id_only=1)
       warn('Translated workflow state getters, such as %s are deprecated' %
             self._id, DeprecationWarning)
@@ -121,10 +116,6 @@ class TranslatedTitleGetter(TitleGetter):
       portal = instance.getPortalObject()
       localizer = portal.Localizer
       wf_id = self._key
-      try:
-        erp5Workflow_module = instance.getPortalObject()._getOb("workflow_module", None)
-        wf = erp5Workflow_module._getOb(self._key) ### _getObjectByRef
-      except:
       wf = portal.portal_workflow.getWorkflowById(wf_id)
       selected_language = localizer.get_selected_language()
       state_title = wf._getWorkflowStateOf(instance).title