From 0d0aaf94bc60f7b3b31ad475be857bd2d196d5f8 Mon Sep 17 00:00:00 2001
From: Fabien Morin <fabien@nexedi.com>
Date: Tue, 13 Oct 2009 15:12:53 +0000
Subject: [PATCH] - in ActionInformation_view, move fields in good groups - set
 id as not editable on other forms than 'view' - add more_columns

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29607 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_core/ActionInformation_view.xml      | 16 +++++++------
 .../erp5_core/BaseType_viewAction.xml         |  8 +++----
 .../erp5_core/BaseType_viewAction/listbox.xml | 24 +++++++++++++++++++
 .../erp5_core/BaseType_viewAction/my_id.xml   |  5 ++++
 .../erp5_core/BaseType_viewRole.xml           |  8 +++----
 .../erp5_core/BaseType_viewRole/my_id.xml     |  5 ++++
 .../erp5_core/BaseType_viewTranslation.xml    |  8 +++----
 .../BaseType_viewTranslation/my_id.xml        |  5 ++++
 .../TypesTool_viewContentList/listbox.xml     | 12 ++++++++++
 product/ERP5/bootstrap/erp5_core/bt/revision  |  2 +-
 10 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ActionInformation_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ActionInformation_view.xml
index bfed5a5582..148562b564 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ActionInformation_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ActionInformation_view.xml
@@ -83,7 +83,9 @@
                 <item>
                     <key> <string>center</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <string>my_description</string>
+                      </list>
                     </value>
                 </item>
                 <item>
@@ -99,20 +101,20 @@
                         <string>my_reference</string>
                         <string>my_title</string>
                         <string>my_action</string>
-                        <string>my_description</string>
                         <string>my_icon</string>
                         <string>my_condition</string>
-                        <string>my_action_permission</string>
-                        <string>my_action_type</string>
-                        <string>my_visible</string>
-                        <string>my_float_index</string>
                       </list>
                     </value>
                 </item>
                 <item>
                     <key> <string>right</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <string>my_action_permission</string>
+                        <string>my_action_type</string>
+                        <string>my_visible</string>
+                        <string>my_float_index</string>
+                      </list>
                     </value>
                 </item>
               </dictionary>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction.xml
index 5d8ee7dfc6..fe5f039770 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction.xml
@@ -85,7 +85,9 @@
                 <item>
                     <key> <string>center</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <string>my_id</string>
+                      </list>
                     </value>
                 </item>
                 <item>
@@ -100,9 +102,7 @@
                 <item>
                     <key> <string>left</string> </key>
                     <value>
-                      <list>
-                        <string>my_id</string>
-                      </list>
+                      <list/>
                     </value>
                 </item>
                 <item>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction/listbox.xml
index b38f65a008..d872b1b376 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction/listbox.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction/listbox.xml
@@ -13,6 +13,7 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>all_columns</string>
                 <string>columns</string>
                 <string>editable_columns</string>
                 <string>portal_types</string>
@@ -111,6 +112,29 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>all_columns</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>reference</string>
+                          <string>Reference</string>
+                        </tuple>
+                        <tuple>
+                          <string>title</string>
+                          <string>Title</string>
+                        </tuple>
+                        <tuple>
+                          <string>action_type_title</string>
+                          <string>Category</string>
+                        </tuple>
+                        <tuple>
+                          <string>float_index</string>
+                          <string>Priority</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>columns</string> </key>
                     <value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction/my_id.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction/my_id.xml
index 4b233d6a48..a1a72a8cea 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction/my_id.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction/my_id.xml
@@ -13,6 +13,7 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>editable</string>
                 <string>title</string>
               </list>
             </value>
@@ -74,6 +75,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_string_field</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewRole.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewRole.xml
index 5f7cf3b85f..0e94eac439 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewRole.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewRole.xml
@@ -85,7 +85,9 @@
                 <item>
                     <key> <string>center</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <string>my_id</string>
+                      </list>
                     </value>
                 </item>
                 <item>
@@ -99,9 +101,7 @@
                 <item>
                     <key> <string>left</string> </key>
                     <value>
-                      <list>
-                        <string>my_id</string>
-                      </list>
+                      <list/>
                     </value>
                 </item>
                 <item>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewRole/my_id.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewRole/my_id.xml
index 4b233d6a48..a1a72a8cea 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewRole/my_id.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewRole/my_id.xml
@@ -13,6 +13,7 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>editable</string>
                 <string>title</string>
               </list>
             </value>
@@ -74,6 +75,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_string_field</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewTranslation.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewTranslation.xml
index 323ac2b325..86e20c46ff 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewTranslation.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewTranslation.xml
@@ -85,7 +85,9 @@
                 <item>
                     <key> <string>center</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <string>my_id</string>
+                      </list>
                     </value>
                 </item>
                 <item>
@@ -99,9 +101,7 @@
                 <item>
                     <key> <string>left</string> </key>
                     <value>
-                      <list>
-                        <string>my_id</string>
-                      </list>
+                      <list/>
                     </value>
                 </item>
                 <item>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewTranslation/my_id.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewTranslation/my_id.xml
index 4b233d6a48..a1a72a8cea 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewTranslation/my_id.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewTranslation/my_id.xml
@@ -13,6 +13,7 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>editable</string>
                 <string>title</string>
               </list>
             </value>
@@ -74,6 +75,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_string_field</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TypesTool_viewContentList/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TypesTool_viewContentList/listbox.xml
index d91cd3832a..585fe9f470 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TypesTool_viewContentList/listbox.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TypesTool_viewContentList/listbox.xml
@@ -15,6 +15,7 @@
               <list>
                 <string>columns</string>
                 <string>selection_name</string>
+                <string>sort</string>
                 <string>title</string>
               </list>
             </value>
@@ -111,6 +112,17 @@
                     <key> <string>selection_name</string> </key>
                     <value> <string>portal_type_selection</string> </value>
                 </item>
+                <item>
+                    <key> <string>sort</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>id</string>
+                          <string>id</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 0ef1886d20..db7ad20dcd 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-1330
\ No newline at end of file
+1331
\ No newline at end of file
-- 
2.30.9