openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #05149
[Merge] lp:~openerp-dev/openobject-client-web/6.0-bug_753340-rco into lp:openobject-client-web/6.0
Raphael Collet (OpenERP) has proposed merging lp:~openerp-dev/openobject-client-web/6.0-bug_753340-rco into lp:openobject-client-web/6.0.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #753340 in OpenERP Web Client: "url actions do not work in menus"
https://bugs.launchpad.net/openobject-client-web/+bug/753340
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-bug_753340-rco/+merge/56727
Fix actions_url in menu in the web client
--
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-bug_753340-rco/+merge/56727
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client-web/6.0-bug_753340-rco.
=== 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-07 10:52:32 +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 items with children
+ if record['children']:
+ record['action'] = None
+
records.append(record)
return {'records': records}