[Erp5-report] r20914 - /erp5/trunk/products/ERP5Form/SelectionTool.py

[nobody at svn.erp5.org]

Author: vincent
Date: Mon May 12 08:04:57 2008
New Revision: 20914

URL: http://svn.erp5.org?rev=20914&view=rev
Log:
checkAll and uncheckAll apply to displayed listbox, and so they should use "list_selection_name" instead of "selection_name". "selection_name" is the name of module-level selection.

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

Modified: erp5/trunk/products/ERP5Form/SelectionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/SelectionTool.py?rev=20914&r1=20913&r2=20914&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/SelectionTool.py (original)
+++ erp5/trunk/products/ERP5Form/SelectionTool.py Mon May 12 08:04:57 2008
@@ -309,12 +309,12 @@
       return []
 
     security.declareProtected(ERP5Permissions.View, 'checkAll')
-    def checkAll(self, selection_name, listbox_uid=[], REQUEST=None,
+    def checkAll(self, list_selection_name, listbox_uid=[], REQUEST=None,
                  query_string=None, form_id=None):
       """
-        Check uids in a given listbox_uid list for a given selection_name
-      """
-      selection_object = self.getSelectionFor(selection_name, REQUEST)
+        Check uids in a given listbox_uid list for a given list_selection_name
+      """
+      selection_object = self.getSelectionFor(list_selection_name, REQUEST)
       if selection_object:
         selection_uid_dict = {}
         for uid in selection_object.checked_uids:
@@ -324,18 +324,18 @@
             selection_uid_dict[int(uid)] = 1
           except ValueError:
             selection_uid_dict[uid] = 1
-        self.setSelectionCheckedUidsFor(selection_name, selection_uid_dict.keys(), REQUEST=REQUEST)
+        self.setSelectionCheckedUidsFor(list_selection_name, selection_uid_dict.keys(), REQUEST=REQUEST)
       if REQUEST is not None:
         return self._redirectToOriginalForm(REQUEST=REQUEST, form_id=form_id,
                                             query_string=query_string, no_reset=True)
 
     security.declareProtected(ERP5Permissions.View, 'uncheckAll')
-    def uncheckAll(self, selection_name, listbox_uid=[], REQUEST=None,
+    def uncheckAll(self, list_selection_name, listbox_uid=[], REQUEST=None,
                    query_string=None, form_id=None):
       """
-        Uncheck uids in a given listbox_uid list for a given selection_name
-      """
-      selection_object = self.getSelectionFor(selection_name, REQUEST)
+        Uncheck uids in a given listbox_uid list for a given list_selection_name
+      """
+      selection_object = self.getSelectionFor(list_selection_name, REQUEST)
       if selection_object:
         selection_uid_dict = {}
         for uid in selection_object.checked_uids:
@@ -345,7 +345,7 @@
             if selection_uid_dict.has_key(int(uid)): del selection_uid_dict[int(uid)]
           except ValueError:
             if selection_uid_dict.has_key(uid): del selection_uid_dict[uid]
-        self.setSelectionCheckedUidsFor(selection_name, selection_uid_dict.keys(), REQUEST=REQUEST)
+        self.setSelectionCheckedUidsFor(list_selection_name, selection_uid_dict.keys(), REQUEST=REQUEST)
       if REQUEST is not None:
         return self._redirectToOriginalForm(REQUEST=REQUEST, form_id=form_id,
                                             query_string=query_string, no_reset=True)