Merge lp:~openerp-dev/openobject-client-web/6.0-bug_753340-rco into lp:openobject-client-web

[Raphael Collet (OpenERP)]

Fix actions_url in menus in the web client

[lp:~openerp-dev/openobject-client-web/6.0-bug_753340-rco]

4570. By Launchpad Translations on behalf of openerp on 2011-04-08

Launchpad automatic translations update.

=== modified file 'addons/openerp/controllers/tree.py'
--- addons/openerp/controllers/tree.py	2011-01-24 09:01:47 +0000
+++ addons/openerp/controllers/tree.py	2011-04-08 08:44:27 +0000
@@ -199,13 +199,13 @@
                 icon = item.pop(icon_name)
                 record['icon'] = icons.get_icon(icon)
 
-                if icon == 'STOCK_OPEN':
-                    record['action'] = None
-                    record['target'] = None
-
             if field_parent and field_parent in item:
                 record['children'] = item.pop(field_parent) or None
 
+                # don't put an action for menu items with children
+                if model == 'ir.ui.menu' and record['children']:
+                    record['action'] = None
+
             records.append(record)
 
         return {'records': records}