[Erp5-report] r22290 - /erp5/trunk/products/ERP5Type/DocumentationHelper/

[nobody at svn.erp5.org]

Author: mayoro
Date: Sat Jul  5 21:26:14 2008
New Revision: 22290

URL: http://svn.erp5.org?rev=22290&view=rev
Log:
using id for temp_object of documentation instead of 'None'

Modified:
    erp5/trunk/products/ERP5Type/DocumentationHelper/DocumentationHelper.py
    erp5/trunk/products/ERP5Type/DocumentationHelper/WorkflowMethodDocumentationHelper.py

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/DocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/DocumentationHelper.py?rev=22290&r1=22289&r2=22290&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/DocumentationHelper.py (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/DocumentationHelper.py Sat Jul  5 21:26:14 2008
@@ -46,7 +46,8 @@
   def __init__(self, container):
     # Folder objects doesn't filter content types.
     # Objects are created in a folder when there is no other choice.
-    self.root = container.newContent(portal_type='Folder', temp_object=1)
+    self.root = container.newContent(portal_type='Folder', temp_object=1, id='temp_instance')
+    #self.root = container.newContent(portal_type='Folder', temp_object=1)
     self.portal_type_dict = {}
     self.dependency_dict = {}
     for type_info in container._getTypesTool().listTypeInfo():
@@ -65,7 +66,7 @@
         container = self(random.choice(possible_parent_list))
       else:
         container = self.root
-      temp_object = container.newContent(portal_type=portal_type, temp_object=1)
+      temp_object = container.newContent(portal_type=portal_type, temp_object=1, id=portal_type)
       self.portal_type_dict[portal_type] = temp_object
     return temp_object
 
@@ -103,7 +104,6 @@
     if self.uri.startswith('portal_classes/temp_instance'):
       url, method = self.uri.split('#')
       portal_type = url.split('/')[-1]
-      self.getTempInstance = TempObjectLibrary(self.getPortalObject().portal_classes)
       temp_object = self.getTempInstance(portal_type)
       if '/' not in method:
         documented_object = getattr(temp_object, method, None)
@@ -147,8 +147,12 @@
         url, method = self.uri.split('#')
         documented_object = self.getPortalObject().unrestrictedTraverse(url, None)
         if '/' not in method:
-          documented_object = self.getPortalObject().unrestrictedTraverse(url, None)
-          documented_object = getattr(documented_object, method, None)
+	  if documented_object is not None:	
+            if documented_object.getId() in self.getPortalObject().portal_types.objectIds():
+              temp_object = self.getTempInstance(documented_object.getId())
+              documented_object = getattr(temp_object, method, None)
+            else:
+              documented_object = getattr(documented_object, method, None)
         else:
           path_method = method.split('/')
           wf_method = path_method[len(path_method)-1]

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/WorkflowMethodDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/WorkflowMethodDocumentationHelper.py?rev=22290&r1=22289&r2=22290&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/WorkflowMethodDocumentationHelper.py (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/WorkflowMethodDocumentationHelper.py Sat Jul  5 21:26:14 2008
@@ -59,7 +59,7 @@
     """
     Returns the title of the documentation helper
     """
-    return getattr(self.getDocumentedObject(), "__name__", '')
+    return getattr(self.getDocumentedObject(), "_transition_id", '')
 
   security.declareProtected( Permissions.AccessContentsInformation, 'getSectionList' )
   def getSectionList(self):
@@ -67,37 +67,6 @@
     Returns a list of documentation sections
     """
     return []
-
-
-  #security.declareProtected(Permissions.AccessContentsInformation, 'getDestinationState' )
-  #def getDestinationState(self):
-  #  """
-  #  Returns the destination_state of the transition workflow method
-  #  """
-  #  return self.getDocumentedObject().__dict__['new_state_id']
-
-  #security.declareProtected(Permissions.AccessContentsInformation, 'getTriggerType' )
-  #def getTriggerType(self):
-  #  """
-  #  Returns the trigger type of the workflow method
-  #  """
-  #  TT = ['Automatic','Initiated by user action','Initiated by WorkflowMethod']
-  #  TT_id = self.getDocumentedObject().__dict__['trigger_type']
-  #  return TT[TT_id]
-
-  #security.declareProtected(Permissions.AccessContentsInformation, 'getLocalRoles' )
-  #def getLocalRoles(self):
-  #  """
-  #  Returns the local roles of the workflow method
-  #  """
-  #  return self.getDocumentedObject().__ac_local_roles__
-
-  #security.declareProtected(Permissions.AccessContentsInformation, 'getAvailableStateIds' )
-  #def getAvailableStateIds(self):
-  #  """
-  #  Returns available states in the workflow
-  #  """
-  #  return self.getDocumentedObject().getAvailableStateIds()
 
   security.declareProtected( Permissions.AccessContentsInformation, 'getDefinition' )
   def getDefinition(self):