[Erp5-report] r7302 - in /erp5/trunk/products/ERP5Form: Selection.py SelectionTool.py

[nobody at svn.erp5.org]

Author: yo
Date: Tue May 16 21:20:05 2006
New Revision: 7302

URL: http://svn.erp5.org?rev=7302&view=rev
Log:
Reset domain_list and report_list with None instead of (), because Selection can set default values with None automatically.

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

Modified: erp5/trunk/products/ERP5Form/Selection.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/Selection.py?rev=7302&r1=7301&r2=7302&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Selection.py (original)
+++ erp5/trunk/products/ERP5Form/Selection.py Tue May 16 21:20:05 2006
@@ -165,7 +165,7 @@
               self.params[key] = params[key]
         if kw is not None:
           for k,v in kw.items():
-            if k in ('domain', 'report', 'domain_path', 'report_path') or v is not None:
+            if k in ('domain', 'report', 'domain_path', 'report_path', 'domain_list', 'report_list') or v is not None:
               # XXX Because method_path is an URI, it must be in ASCII.
               #     Shouldn't Zope automatically does this conversion? -yo
               if k == 'method_path' and type(v) is type(u'a'):

Modified: erp5/trunk/products/ERP5Form/SelectionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/SelectionTool.py?rev=7302&r1=7301&r2=7302&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/SelectionTool.py (original)
+++ erp5/trunk/products/ERP5Form/SelectionTool.py Tue May 16 21:20:05 2006
@@ -334,9 +334,9 @@
       if selection is not None:
         selection.edit(invert_mode=0, params={}, checked_uids=[])
         if reset_domain_tree:
-          selection.edit(domain=None, domain_path=None, domain_list=())
+          selection.edit(domain=None, domain_path=None, domain_list=None)
         if reset_report_tree:
-          selection.edit(report=None, report_path=None, report_list=())
+          selection.edit(report=None, report_path=None, report_list=None)
 
     security.declareProtected(ERP5Permissions.View, 'setSelectionSortOrder')
     def setSelectionSortOrder(self, selection_name, sort_on, REQUEST=None):