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

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Aug 3 09:51:52 CEST 2010


Author: jerome
Date: Tue Aug  3 09:51:51 2010
New Revision: 37427

URL: http://svn.erp5.org?rev=37427&view=rev
Log:
sometimes we do not have object_view actions

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=37427&r1=37426&r2=37427&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] Tue Aug  3 09:51:51 2010
@@ -55,7 +55,7 @@
             <key> <string>_body</string> </key>
             <value> <string># Return the current action to know which tab is selected\n
 \n
-for action in actions[\'object_view\']:\n
+for action in actions.get(\'object_view\', []):\n
   if current_url == action[\'url\'].split(\'?\')[0]:\n
     return action\n
 </string> </value>
@@ -97,9 +97,9 @@ for action in actions[\'object_view\']:\
                             <string>current_url</string>
                             <string>actions</string>
                             <string>_getiter_</string>
-                            <string>_getitem_</string>
-                            <string>action</string>
                             <string>_getattr_</string>
+                            <string>action</string>
+                            <string>_getitem_</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=37427&r1=37426&r2=37427&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Tue Aug  3 09:51:51 2010
@@ -1 +1 @@
-1642
\ No newline at end of file
+1643
\ No newline at end of file




More information about the Erp5-report mailing list