[Erp5-report] r30619 - in /erp5/trunk/products/ERP5Type: Base.py CopySupport.py ERP5Type.py

[nobody at svn.erp5.org]

Author: yo
Date: Sat Nov 14 12:25:01 2009
New Revision: 30619

URL: http://svn.erp5.org?rev=30619&view=rev
Log:
Get tools from a portal.

Modified:
    erp5/trunk/products/ERP5Type/Base.py
    erp5/trunk/products/ERP5Type/CopySupport.py
    erp5/trunk/products/ERP5Type/ERP5Type.py

Modified: erp5/trunk/products/ERP5Type/Base.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Base.py?rev=30619&r1=30618&r2=30619&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Base.py [utf8] Sat Nov 14 12:25:01 2009
@@ -1922,7 +1922,7 @@
     """
       Returns the url of an object relative to the portal site.
     """
-    return self.portal_url.getRelativeUrl(self)
+    return self.getPortalObject().portal_url.getRelativeUrl(self)
 
   security.declareProtected(Permissions.AccessContentsInformation,
                             'getAbsoluteUrl')
@@ -3212,7 +3212,7 @@
       Returns the creation date of the document based on workflow information
     """
     # Check if edit_workflow defined
-    portal_workflow = getToolByName(self, 'portal_workflow')
+    portal_workflow = getToolByName(self.getPortalObject(), 'portal_workflow')
     wf = portal_workflow.getWorkflowById('edit_workflow')
     wf_list = list(portal_workflow.getWorkflowsFor(self))
     if wf is not None: wf_list = [wf] + wf_list
@@ -3238,7 +3238,7 @@
       variable on the workflow which is an alias to time.
     """
     # Check if edit_workflow defined
-    portal_workflow = getToolByName(self, 'portal_workflow')
+    portal_workflow = getToolByName(self.getPortalObject(), 'portal_workflow')
     wf = portal_workflow.getWorkflowById('edit_workflow')
     wf_list = list(portal_workflow.getWorkflowsFor(self))
     if wf is not None:

Modified: erp5/trunk/products/ERP5Type/CopySupport.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/CopySupport.py?rev=30619&r1=30618&r2=30619&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/CopySupport.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/CopySupport.py [utf8] Sat Nov 14 12:25:01 2009
@@ -72,7 +72,7 @@
           ids=[uids]
       oblist=[]
       for uid in uids:
-          ob=self.portal_catalog.getObject(uid)
+          ob=self.getPortalObject().portal_catalog.getObject(uid)
           if not ob.cb_isCopyable():
               raise CopyError, eNotSupported % uid
           m=Moniker.Moniker(ob)
@@ -187,7 +187,7 @@
           ids=[uids]
       oblist=[]
       for uid in uids:
-          ob=self.portal_catalog.getObject(uid)
+          ob=self.getPortalObject().portal_catalog.getObject(uid)
           if not ob.cb_isMoveable():
               raise CopyError, eNotSupported % id
           m=Moniker.Moniker(ob)
@@ -221,7 +221,7 @@
                  action ='./manage_main',)
       while uids:
           uid=uids[-1]
-          ob=self.portal_catalog.getObject(uid)
+          ob=self.getPortalObject().portal_catalog.getObject(uid)
           container = ob.aq_inner.aq_parent
           id = ob.id
           v=container._getOb(id, self)
@@ -243,7 +243,7 @@
     self_base = aq_base(self)
     #LOG("After Clone ",0, "self:%s item:%s" % (repr(self), repr(item)))
     #LOG("After Clone ",0, "self:%s item:%s" % (repr(self), repr(self.getPortalObject().objectIds())))
-    portal_catalog = getToolByName(self, 'portal_catalog')
+    portal_catalog = getToolByName(self.getPortalObject(), 'portal_catalog')
     self_base.uid = portal_catalog.newUid()
 
     # Give the Owner local role to the current user, zope only does this if no
@@ -348,7 +348,7 @@
           Unindex the object from the portal catalog.
       """
       if self.isIndexable:
-        catalog = getToolByName(self, 'portal_catalog', None)
+        catalog = getToolByName(self.getPortalObject(), 'portal_catalog', None)
         if catalog is not None:
           # Make sure there is not activity for this object
           self.flushActivity(invoke=0)
@@ -388,7 +388,7 @@
           # Update the modification date.
           if getattr(aq_base(self), 'notifyModified', _marker) is not _marker:
               self.notifyModified()
-      catalog = getToolByName(self, 'portal_catalog', None)
+      catalog = getToolByName(self.getPortalObject(), 'portal_catalog', None)
       if catalog is not None:
           catalog.moveObject(self, idxs=idxs)
 
@@ -499,7 +499,7 @@
 
   def _postDuplicate(self):
     self_base = aq_base(self)
-    portal_catalog = getToolByName(self, 'portal_catalog')
+    portal_catalog = getToolByName(self.getPortalObject(), 'portal_catalog')
     self_base.uid = portal_catalog.newUid()
 
     # Give the Owner local role to the current user, zope only does this if no

Modified: erp5/trunk/products/ERP5Type/ERP5Type.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/ERP5Type.py?rev=30619&r1=30618&r2=30619&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/ERP5Type.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/ERP5Type.py [utf8] Sat Nov 14 12:25:01 2009
@@ -370,7 +370,7 @@
 
         # notify workflow after generating local roles, in order to prevent
         # Unauthorized error on transition's condition
-        workflow_tool = getToolByName(self, 'portal_workflow', None)
+        workflow_tool = getToolByName(self.getPortalObject(), 'portal_workflow', None)
         if workflow_tool is not None:
           for workflow in workflow_tool.getWorkflowsFor(ob):
             workflow.notifyCreated(ob)