[Erp5-report] r22070 - /erp5/trunk/products/ERP5/Document/Document.py

[nobody at svn.erp5.org]

Author: ivan
Date: Mon Jun 30 11:22:49 2008
New Revision: 22070

URL: http://svn.erp5.org?rev=22070&view=rev
Log:
Do not try to remove from list of related documents the HTML representation of a document.
Instead remove the document itself.

Modified:
    erp5/trunk/products/ERP5/Document/Document.py

Modified: erp5/trunk/products/ERP5/Document/Document.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Document.py?rev=22070&r1=22069&r2=22070&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Document.py (original)
+++ erp5/trunk/products/ERP5/Document/Document.py Mon Jun 30 11:22:49 2008
@@ -367,7 +367,6 @@
 
     if cache is not None:
       if cache.get(key, _MARKER) is _MARKER: cache[key] = method
-
     return method(name, portal=portal, **kw)
 
 class Document(PermanentURLMixIn, XMLObject, UrlMixIn, ConversionCacheMixin, SnapshotMixin):
@@ -794,8 +793,9 @@
       lista_latest[o.getLatestVersionValue()] = True # get latest versions avoiding duplicates again
     if lista_latest.has_key(self): 
       lista_latest.pop(self) # remove this document
-    if lista_latest.has_key(self.getLatestVersionValue()): 
-      lista_latest.pop(self()) # remove this document
+    if lista_latest.has_key(self.getLatestVersionValue()):
+      # remove last version of document itself from related documents
+      lista_latest.pop(self.getLatestVersionValue()) 
 
     return lista_latest.keys()