[Erp5-report] r19760 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Mar 7 18:34:08 CET 2008
Author: jerome
Date: Fri Mar 7 18:34:08 2008
New Revision: 19760
URL: http://svn.erp5.org?rev=19760&view=rev
Log:
Change the delete confirmation dialog to use the same columns as in the previous list
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=19760&r1=19759&r2=19760&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 Fri Mar 7 18:34:08 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PythonScripts.PythonScript</string>
- <string>PythonScript</string>
- </tuple>
- <none/>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -68,7 +65,9 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>request=context.REQUEST\n
+ <value> <string encoding="cdata"><![CDATA[
+
+request=context.REQUEST\n
portal = context.getPortalObject()\n
N_ = portal.Base_translateString\n
\n
@@ -80,12 +79,21 @@
qs = \'?portal_status_message=%s\' % message\n
return request.RESPONSE.redirect( context.absolute_url() + \'/\' + form_id + qs )\n
\n
-kw = {\'uid\': uids}\n
+# XXX If we come from the view mode -> list mode proxy, make sure we don\'t make\n
+# another proxy to this proxy.\n
+if form_id == \'Base_viewListModeRenderer\':\n
+ form_id = context.Base_viewListModeRenderer.listbox.get_value(\'form_id\')\n
+\n
+kw = {\'uid\': uids, \'form_id\': form_id}\n
request.set(\'object_uid\', context.getUid())\n
request.set(\'uids\', uids)\n
+request.set(\'proxy_form_id\', form_id)\n
+\n
context.portal_selections.setSelectionParamsFor(\'folder_delete_selection\', kw)\n
return context.Folder_viewDeleteDialog(uids=uids, REQUEST=request)\n
-</string> </value>
+
+
+]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
@@ -95,6 +103,12 @@
</item>
<item>
<key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
<value>
<none/>
</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=19760&r1=19759&r2=19760&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 Fri Mar 7 18:34:08 2008
@@ -3,12 +3,33 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="ListBox" module="Products.ERP5Form.ListBox"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>title</string>
+ <string>columns</string>
+ <string>list_method</string>
+ <string>selection_name</string>
+ <string>search</string>
+ <string>select</string>
+ <string>anchor</string>
+ <string>editable_columns</string>
+ </list>
+ </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox</string> </value>
@@ -29,289 +50,97 @@
<value>
<dictionary>
<item>
- <key> <string>all_columns</string> </key>
- <value> <string></string> </value>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>anchor</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>columns</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>editable_columns</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>list_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>search</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>select</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>selection_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>Base_viewSearchResultList</string> </key>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>all_editable_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default_params</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_root_list</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_tree</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>global_attributes</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>lines</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>list_action</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>list_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>meta_types</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>portal_types</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>report_root_list</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>report_tree</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>search</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>search_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>select</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>selection_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>sort</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>sort_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>stat_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>stat_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>url_columns</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>all_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>all_editable_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default_params</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_root_list</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_tree</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>global_attributes</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>lines</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>list_action</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>list_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>meta_types</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>portal_types</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>report_root_list</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>report_tree</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>search</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>search_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>select</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>selection_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>sort</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>sort_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>stat_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>stat_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>url_columns</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>Base_viewSearchResultList</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>all_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>anchor</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>columns</string> </key>
<value>
<list>
<tuple>
@@ -338,88 +167,7 @@
</value>
</item>
<item>
- <key> <string>all_editable_columns</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>anchor</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>columns</string> </key>
- <value>
- <list>
- <tuple>
- <string>id</string>
- <string>ID</string>
- </tuple>
- <tuple>
- <string>translated_portal_type</string>
- <string>Type</string>
- </tuple>
- <tuple>
- <string>title</string>
- <string>Title</string>
- </tuple>
- <tuple>
- <string>relative_url</string>
- <string>Path</string>
- </tuple>
- <tuple>
- <string>description</string>
- <string>Description</string>
- </tuple>
- <tuple>
- <string>related_object_list_quantity</string>
- <string>No. Related Objects</string>
- </tuple>
- </list>
- </value>
- </item>
- <item>
- <key> <string>count_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default_params</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_root_list</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>domain_tree</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>editable_columns</string> </key>
+ <key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
@@ -430,133 +178,50 @@
</value>
</item>
<item>
- <key> <string>enabled</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>global_attributes</string> </key>
- <value>
- <list/>
- </value>
+ <key> <string>field_id</string> </key>
+ <value> <string>listbox</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <int>5</int> </value>
</item>
<item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>lines</string> </key>
- <value> <int>30</int> </value>
- </item>
- <item>
- <key> <string>list_action</string> </key>
- <value> <string>list</string> </value>
- </item>
- <item>
<key> <string>list_cookie</string> </key>
<value> <string>SEARCH_LIST</string> </value>
</item>
<item>
- <key> <string>list_method</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>meta_types</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>page_template</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>portal_types</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>report_root_list</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>report_tree</string> </key>
- <value> <int>0</int> </value>
+ <key> <string>list_method</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>reverse</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>search</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>search_columns</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>select</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>selection_name</string> </key>
+ <key> <string>search</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>select</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>selection_name</string> </key>
<value> <string>folder_delete_selection</string> </value>
</item>
<item>
- <key> <string>sort</string> </key>
- <value>
- <list>
- <tuple>
- <string>relative_url</string>
- <string>relative_url</string>
- </tuple>
- </list>
- </value>
- </item>
- <item>
- <key> <string>sort_columns</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>stat_columns</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>stat_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Results</string> </value>
- </item>
- <item>
- <key> <string>url_columns</string> </key>
- <value>
- <list/>
- </value>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Delete The Objects</string> </value>
</item>
<item>
<key> <string>width</string> </key>
@@ -571,6 +236,54 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: field.getTemplateField().get_value(\'columns\') + [(\'related_object_list_quantity\', \'No. Related Objects\')]</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: field.getTemplateField().get_value(\'editable_columns\') + [(\'related_object_list_quantity\', \'No. Related Objects\')]</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <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=">
+ <pickle>
+ <tuple>
<global name="Method" module="Products.Formulator.MethodField"/>
<tuple/>
</tuple>
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=19760&r1=19759&r2=19760&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Fri Mar 7 18:34:08 2008
@@ -1,1 +1,1 @@
-726
+727
More information about the Erp5-report
mailing list