From cbfc003554fd5b378fcee05aac8dc1003dc08a04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Wed, 6 Oct 2010 11:18:46 +0000
Subject: [PATCH] Since 38891 actions are sorted globally, not anymore locally
to an action provider. Give lower priority to those global actions so that
they appear after portal types actions
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38922 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_types/portal_properties/ods_export.xml | 12 +++---------
bt5/erp5_ods_style/bt/revision | 2 +-
.../portal_types/portal_properties/print.xml | 12 +++---------
bt5/erp5_odt_style/bt/revision | 2 +-
.../portal_types/portal_actions/make_template.xml | 2 +-
.../portal_types/portal_properties/list_ui.xml | 2 +-
.../portal_types/portal_properties/mass_workflow.xml | 2 +-
.../portal_types/portal_properties/module_view.xml | 2 +-
.../portal_types/portal_properties/search.xml | 2 +-
.../portal_types/portal_properties/sort_on.xml | 2 +-
product/ERP5/bootstrap/erp5_core/bt/revision | 2 +-
11 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_export.xml b/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_export.xml
index ba3d584c26..e120485e33 100644
--- a/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_export.xml
+++ b/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_export.xml
@@ -2,10 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
- <tuple>
- <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
- <tuple/>
- </tuple>
+ <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
@@ -45,7 +42,7 @@
</item>
<item>
<key> <string>priority</string> </key>
- <value> <float>4.0</float> </value>
+ <value> <float>100.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -60,10 +57,7 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
- <tuple>
- <global name="Expression" module="Products.CMFCore.Expression"/>
- <tuple/>
- </tuple>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
diff --git a/bt5/erp5_ods_style/bt/revision b/bt5/erp5_ods_style/bt/revision
index 34578cc4c5..eaea6f5971 100644
--- a/bt5/erp5_ods_style/bt/revision
+++ b/bt5/erp5_ods_style/bt/revision
@@ -1 +1 @@
-239
\ No newline at end of file
+240
\ No newline at end of file
diff --git a/bt5/erp5_odt_style/ActionTemplateItem/portal_types/portal_properties/print.xml b/bt5/erp5_odt_style/ActionTemplateItem/portal_types/portal_properties/print.xml
index c25f284f8f..76224a0e4d 100644
--- a/bt5/erp5_odt_style/ActionTemplateItem/portal_types/portal_properties/print.xml
+++ b/bt5/erp5_odt_style/ActionTemplateItem/portal_types/portal_properties/print.xml
@@ -2,10 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
- <tuple>
- <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
- <tuple/>
- </tuple>
+ <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
@@ -45,7 +42,7 @@
</item>
<item>
<key> <string>priority</string> </key>
- <value> <float>2.0</float> </value>
+ <value> <float>100.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -60,10 +57,7 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
- <tuple>
- <global name="Expression" module="Products.CMFCore.Expression"/>
- <tuple/>
- </tuple>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
diff --git a/bt5/erp5_odt_style/bt/revision b/bt5/erp5_odt_style/bt/revision
index 6d58c4e590..97e3504110 100644
--- a/bt5/erp5_odt_style/bt/revision
+++ b/bt5/erp5_odt_style/bt/revision
@@ -1 +1 @@
-109
\ No newline at end of file
+110
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/make_template.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/make_template.xml
index ff9227b209..8565fc41fe 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/make_template.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/make_template.xml
@@ -44,7 +44,7 @@
</item>
<item>
<key> <string>priority</string> </key>
- <value> <float>20.0</float> </value>
+ <value> <float>101.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/list_ui.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/list_ui.xml
index f8fe63ca2d..d6c043eaaa 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/list_ui.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/list_ui.xml
@@ -42,7 +42,7 @@
</item>
<item>
<key> <string>priority</string> </key>
- <value> <float>1.0</float> </value>
+ <value> <float>100.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/mass_workflow.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/mass_workflow.xml
index 2d575cff30..74930b66be 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/mass_workflow.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/mass_workflow.xml
@@ -44,7 +44,7 @@
</item>
<item>
<key> <string>priority</string> </key>
- <value> <float>1.0</float> </value>
+ <value> <float>100.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/module_view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/module_view.xml
index a23970cc98..b358e7e161 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/module_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/module_view.xml
@@ -44,7 +44,7 @@
</item>
<item>
<key> <string>priority</string> </key>
- <value> <float>1.5</float> </value>
+ <value> <float>100.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/search.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/search.xml
index f8e1c7769b..f868cd2a91 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/search.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/search.xml
@@ -42,7 +42,7 @@
</item>
<item>
<key> <string>priority</string> </key>
- <value> <float>1.0</float> </value>
+ <value> <float>100.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/sort_on.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/sort_on.xml
index 0ba95e759b..cc89439c9f 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/sort_on.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_properties/sort_on.xml
@@ -42,7 +42,7 @@
</item>
<item>
<key> <string>priority</string> </key>
- <value> <float>1.0</float> </value>
+ <value> <float>100.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index fe59cd29b5..1d3ea88a45 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-1737
\ No newline at end of file
+1738
\ No newline at end of file
--
2.30.9