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

[nobody at svn.erp5.org]

Author: seb
Date: Mon Mar  3 17:37:34 2008
New Revision: 19654

URL: http://svn.erp5.org?rev=19654&view=rev
Log:
- make the selection of the tab in the view form working even if there is another action using the same form with different parameters.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getCurrentAction.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getCurrentAction.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getCurrentAction.xml?rev=19654&r1=19653&r2=19654&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getCurrentAction.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getCurrentAction.xml Mon Mar  3 17:37:34 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>
@@ -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
 

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=19654&r1=19653&r2=19654&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Mon Mar  3 17:37:34 2008
@@ -1,1 +1,1 @@
-718
+721