From f161dd077fd6eadb8f172da734c87ea39bbebcdc Mon Sep 17 00:00:00 2001
From: Sebastien Robin <seb@nexedi.com>
Date: Mon, 3 Mar 2008 16:37:34 +0000
Subject: [PATCH] - make the selection of the tab in the view form working even
 if there is another action using the same form with different parameters.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19654 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_core/ERP5Site_getCurrentAction.xml            | 10 ++++------
 product/ERP5/bootstrap/erp5_core/bt/revision           |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getCurrentAction.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getCurrentAction.xml
index 030d585f17..807a6ba6a2 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getCurrentAction.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getCurrentAction.xml
@@ -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>
@@ -75,7 +72,8 @@
 \n
 for action_list in actions.values():\n
   for action in action_list:\n
-   if current_url == action[\'url\'].split(\'?\')[0]:\n
+   if action[\'category\'] in (\'object_view\', \'object_button\') and \\\n
+       current_url == action[\'url\'].split(\'?\')[0]:\n
      return action\n
 return None\n
 
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 00607554c6..6f210dddb2 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-718
\ No newline at end of file
+721
-- 
2.30.9