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

[nobody at svn.erp5.org]

Author: aurel
Date: Tue Jan 22 17:54:02 2008
New Revision: 18830

URL: http://svn.erp5.org?rev=18830&view=rev
Log:
fix way to retrieve selection name

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=18830&r1=18829&r2=18830&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/SelectionTool.py (original)
+++ erp5/trunk/products/ERP5Form/SelectionTool.py Tue Jan 22 17:54:02 2008
@@ -427,6 +427,7 @@
       """
       # selection_name, sort_on and form_id params are kept only for bacward compatibilty
       # as some test call setSelectionQuickSortOrder in url with these params
+      listbox_id = None
       if sort_on is None:
         listbox_id, sort_on = REQUEST.form["setSelectionQuickSortOrder"].split(".", 1)
 
@@ -436,14 +437,13 @@
             form_id = REQUEST.form['dialog_id']
           else:
             form_id = REQUEST.form['form_id']
-      if selection_name is None:
-        if REQUEST.form.has_key('selection_name'):
+
+      if listbox_id is not None:
+          selection_name_key = "%s_list_selection_name" %listbox_id
+          selection_name = REQUEST.form[selection_name_key]
+      elif selection_name is None:
           selection_name = REQUEST.form['selection_name']
-        else:
-          object_path = REQUEST.form['object_path']
-          o = self.restrictedTraverse(object_path)
-          form = getattr(o, form_id)
-          selection_name = form[listbox_id].get_value('selection_name')
+          
       selection = self.getSelectionFor(selection_name, REQUEST=REQUEST)
       if selection is not None:
         current_sort_on = self.getSelectionSortOrder(selection_name)