[Erp5-report] r13692 - /erp5/trunk/products/ERP5Form/Selection.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Mar 27 10:33:39 2007
New Revision: 13692

URL: http://svn.erp5.org?rev=13692&view=rev
Log:
revise codes to avoid duplicate attribute error.

Modified:
    erp5/trunk/products/ERP5Form/Selection.py

Modified: erp5/trunk/products/ERP5Form/Selection.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/Selection.py?rev=13692&r1=13691&r2=13692&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Selection.py (original)
+++ erp5/trunk/products/ERP5Form/Selection.py Tue Mar 27 10:33:39 2007
@@ -192,17 +192,19 @@
           kw['sort_on'] = sort_on
         elif kw.has_key('sort_on'):
           del kw['sort_on'] # We should not sort if no sort was defined
+        if not kw.has_key('selection_name'):
+          kw['selection_name'] = self.name
         if method is not None:
           if callable(method):
             if self.domain is not None and self.report is not None:
               result = method(selection_domain = self.domain,
-                              selection_report = self.report, selection=self, selection_name=self.name, **kw)
+                              selection_report = self.report, selection=self, **kw)
             elif self.domain is not None:
-              result = method(selection_domain = self.domain, selection=self, selection_name=self.name, **kw)
+              result = method(selection_domain = self.domain, selection=self, **kw)
             elif self.report is not None:
-              result = method(selection_report = self.report, selection=self, selection_name=self.name, **kw)
+              result = method(selection_report = self.report, selection=self, **kw)
             else:
-              result = method(selection=self, selection_name=self.name, **kw)
+              result = method(selection=self, **kw)
             return result
           else:
             return []