[Erp5-report] r22088 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Jun 30 15:45:04 2008
New Revision: 22088

URL: http://svn.erp5.org?rev=22088&view=rev
Log:
Folder_viewDeleteDialog proxy field could not find the original listbox if it's id were not listbox

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog/listbox.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml?rev=22088&r1=22087&r2=22088&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml Mon Jun 30 15:45:04 2008
@@ -83,11 +83,13 @@
 # another proxy to this proxy.\n
 if form_id == \'Base_viewListModeRenderer\':\n
   form_id = context.Base_viewListModeRenderer.listbox.get_value(\'form_id\')\n
+  field_id = context.Base_viewListModeRenderer.listbox.get_value(\'field_id\')\n
 \n
-kw = {\'uid\': uids, \'form_id\': form_id}\n
+kw = {\'uid\': uids, \'form_id\': form_id, \'field_id\': field_id}\n
 request.set(\'object_uid\', context.getUid())\n
 request.set(\'uids\', uids)\n
 request.set(\'proxy_form_id\', form_id)\n
+request.set(\'proxy_field_id\', field_id)\n
 \n
 context.portal_selections.setSelectionParamsFor(\'folder_delete_selection\', kw)\n
 return context.Folder_viewDeleteDialog(uids=uids, REQUEST=request)\n
@@ -154,6 +156,7 @@
                             <string>selected_uids</string>
                             <string>message</string>
                             <string>qs</string>
+                            <string>field_id</string>
                             <string>kw</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog/listbox.xml?rev=22088&r1=22087&r2=22088&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog/listbox.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog/listbox.xml Mon Jun 30 15:45:04 2008
@@ -86,12 +86,14 @@
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -196,7 +198,7 @@
                 <item>
                     <key> <string>list_method</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -276,12 +278,28 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
+            <value> <string>request/proxy_field_id | python: here.portal_selections.getSelectionParamsFor(\'folder_delete_selection\').get(\'field_id\', \'listbox\')</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="5" aka="AAAAAAAAAAU=">
+    <pickle>
+      <tuple>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
             <value> <string>request/proxy_form_id | python: here.portal_selections.getSelectionParamsFor(\'folder_delete_selection\')[\'form_id\']</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="5" aka="AAAAAAAAAAU=">
+  <record id="6" aka="AAAAAAAAAAY=">
     <pickle>
       <tuple>
         <global name="Method" module="Products.Formulator.MethodField"/>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=22088&r1=22087&r2=22088&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Mon Jun 30 15:45:04 2008
@@ -1,1 +1,1 @@
-865
+866