2010-05-07 Seb

* make sorting on the listbox displayed by jump working
(before it was changing the number of columns)
* some jump were sometimes not working when another jump
was used before, so reset selection in order to make every jump
independant

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

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getRelatedObjectParameter.xml

@@ -57,8 +57,16 @@
 # by Base_viewRelatedObjectList from the relation field\n
 result = None\n
 \n
+request = context.REQUEST\n
+\n
 if parameter is not None:\n
-  listbox = getattr(context, context.REQUEST.form_id, None).get_field( context.REQUEST.field_id )\n
+  field_id = request.get(\'field_id\',None) \\\n
+      or request.get(\'field_your_field_id\', None) \\\n
+      or request.get(\'form_id\', None)\n
+  form_id = request.get(\'original_form_id\',None) \\\n
+      or request.get(\'field_your_original_form_id\', None) \\\n
+      or request.get(\'form_id\')\n
+  listbox = getattr(context, form_id).get_field(field_id)\n
   dialog_id = listbox.get_value(\'relation_form_id\') or \'Base_viewRelatedObjectList\'\n
   result = listbox.get_value(parameter)\n
 \n
@@ -124,8 +132,11 @@ return result\n
                             <string>None</string>
                             <string>result</string>
                             <string>_getattr_</string>
-                            <string>getattr</string>
                             <string>context</string>
+                            <string>request</string>
+                            <string>field_id</string>
+                            <string>form_id</string>
+                            <string>getattr</string>
                             <string>listbox</string>
                             <string>dialog_id</string>
                             <string>portal_type</string>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_jumpToRelatedDocument.xml

@@ -73,9 +73,14 @@ if len(jump_reference_list)==1:\n
 else:\n
   selection_uid_list = map(lambda x:x.getUid(),jump_reference_list)\n
   kw = {\'uid\': selection_uid_list}\n
+  # We need to reset the selection. Indeed, some sort columns done in another \n
+  # jump could be meaningless for this particular jump. The consequence could \n
+  # be an empty list\n
+  context.portal_selections.setSelectionFor(\'Base_jumpToRelatedObjectList\', None)\n
   context.portal_selections.setSelectionParamsFor(\'Base_jumpToRelatedObjectList\',kw)\n
   request.set(\'object_uid\', context.getUid())\n
   request.set(\'uids\', selection_uid_list)\n
+  request.set(\'original_form_id\', form_id)\n
   return context.Base_jumpToRelatedObjectList(uids=selection_uid_list, REQUEST=request)\n
 </string> </value>
         </item>
@@ -142,6 +147,7 @@ else:\n
                             <string>_getitem_</string>
                             <string>jump_reference</string>
                             <string>selection_uid_list</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_jumpToRelatedObjectList.xml

@@ -40,6 +40,16 @@
             <key> <string>action</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>edit_order</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>encoding</string> </key>
             <value> <string>UTF-8</string> </value>
@@ -65,6 +75,8 @@
                     <value>
                       <list>
                         <string>listbox</string>
+                        <string>your_field_id</string>
+                        <string>your_original_form_id</string>
                       </list>
                     </value>
                 </item>
@@ -107,6 +119,10 @@
             <key> <string>update_action</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>update_action_title</string> </key>
+            <value> <string></string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>

product/ERP5/bootstrap/erp5_core/bt/revision

-1579
\ No newline at end of file
+1580
\ No newline at end of file