Corrected nextPage bug in RelationField selection.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@2396 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Form/SelectionTool.py

@@ -504,6 +504,8 @@ class SelectionTool( UniqueObject, SimpleItem ):
       request = REQUEST
       #form_id = request.form_id
       selection_name = request.list_selection_name
+
+      
       selection = self.getSelectionFor(selection_name, REQUEST=REQUEST)
       if selection is not None:
         params = selection.getParams()
@@ -878,9 +880,12 @@ class SelectionTool( UniqueObject, SimpleItem ):
       field_value = REQUEST.form['field_%s' % field.id]
 
       selection_name = 'Base_viewRelatedObjectList'
+      
       # reselt current selection
       self.portal_selections.setSelectionFor( selection_name, None)
 
+      # XXX portal_status_message = "Please select one object to precise the value: '%s' in the field: '%s'" % ( field_value, field.get_orig_value('title') )
+      portal_status_message = "Please select one object."
 
       if field.meta_type == "MultiRelationStringField":
         if method_count2 == None:
@@ -895,17 +900,23 @@ class SelectionTool( UniqueObject, SimpleItem ):
           current_uid_list = getattr( o, property_get_related_uid_method_name )( portal_type=map(lambda x:x[0],field.get_value('portal_type')))
 
           #selected_uids = self.portal_selections.updateSelectionCheckedUidList(selection_name,[],current_uid)
-          self.portal_selections.setSelectionCheckedUidsFor(selection_name , current_uid_list, REQUEST=REQUEST )
+          # XXX do not work.... and I do not know why... (Romain)
+          self.portal_selections.setSelectionCheckedUidsFor(selection_name , current_uid_list )
+          #self.portal_selections.setSelectionCheckedUidsFor(selection_name , current_uid_list, REQUEST=REQUEST )
 
           # change current value to '%'
           field_value = '%'
           REQUEST.form['field_%s' % field.id] = field_value
+          # XXX portal_status_message = "Please select one or more object to define the field: '%s'" % field.get_orig_value('title')
+          portal_status_message = "Please select one (or more) object."
 
       elif field.meta_type == "RelationStringField":
         # If user click on the wheel without validate the form (ie: want to search the relation without writing '%' ) 
         if field_value in ( '', None ):
           field_value = '%'
           REQUEST.form['field_%s' % field.id] = field_value
+          # XXX portal_status_message = "Please select only one object to define the field: '%s'" % field.get_orig_value('title')
+
 
 
       # Save the current REQUEST form
@@ -942,14 +953,26 @@ class SelectionTool( UniqueObject, SimpleItem ):
       uids = []
       """
 
-      # Empty the selection (uid)
-      REQUEST.form = kw # New request form
+      # Need to redirect, if we want listbox nextPage to work
+      kw['form_pickle'] = form_pickle
+      kw['form_signature'] = form_signature
+      kw['portal_status_message'] = portal_status_message
 
-      # Define new HTTP_REFERER
-      REQUEST.HTTP_REFERER = '%s/Base_viewRelatedObjectList' % o.absolute_url() 
+      redirect_url = '%s/%s?%s' % ( o.absolute_url()
+                                , 'Base_viewRelatedObjectList'
+                                , make_query(kw)
+                                )    
+
+      REQUEST[ 'RESPONSE' ].redirect( redirect_url )
 
-      # Return the search dialog
-      return o.Base_viewRelatedObjectList(REQUEST=REQUEST)
+#      # Empty the selection (uid)
+#      REQUEST.form = kw # New request form
+#                  
+#      # Define new HTTP_REFERER
+#      REQUEST.HTTP_REFERER = '%s/Base_viewRelatedObjectList' % o.absolute_url() 
+#      
+#      # Return the search dialog
+#      return o.Base_viewRelatedObjectList(REQUEST=REQUEST)
 
 
      # XXX do not use this method, use aq_dynamic (JPS)