[Erp5-report] r37384 jerome - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplat...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Jul 30 15:25:12 2010
New Revision: 37384

URL: http://svn.erp5.org?rev=37384&view=rev
Log:
don't iterate in all actions, only object_view

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=37384&r1=37383&r2=37384&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getCurrentAction.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getCurrentAction.xml [utf8] Fri Jul 30 15:25:12 2010
@@ -53,20 +53,12 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-# Return the current action to know which tab we should select\n
-# Christophe Dumez <christophe at nexedi.com>\n
+            <value> <string># Return the current action to know which tab is selected\n
 \n
-for action_list in actions.values():\n
-  for action in action_list:\n
-   if action[\'category\'] in (\'object_view\', \'object_button\') and \\\n
-       current_url == action[\'url\'].split(\'?\')[0]:\n
-     return action\n
-return None\n
-
-
-]]></string> </value>
+for action in actions[\'object_view\']:\n
+  if current_url == action[\'url\'].split(\'?\')[0]:\n
+    return action\n
+</string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
@@ -105,11 +97,9 @@ return None\n
                             <string>current_url</string>
                             <string>actions</string>
                             <string>_getiter_</string>
-                            <string>_getattr_</string>
-                            <string>action_list</string>
-                            <string>action</string>
                             <string>_getitem_</string>
-                            <string>None</string>
+                            <string>action</string>
+                            <string>_getattr_</string>
                           </tuple>
                         </value>
                     </item>

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=37384&r1=37383&r2=37384&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Fri Jul 30 15:25:12 2010
@@ -1 +1 @@
-1641
\ No newline at end of file
+1642
\ No newline at end of file