openerp-community team mailing list archive

["Stefan Rijnhart \(Therp\)" <stefan@xxxxxxxx>]

Stefan Rijnhart (Therp) has proposed merging lp:~openerp-community/openobject-client-web/stefan-therp_lp759896-6.0 into lp:openobject-client-web/6.0.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #759896 in OpenERP Web Client: "[6.0 rev 4577] Menu actions stopped working if the menu item has children"
  https://bugs.launchpad.net/openobject-client-web/+bug/759896

For more details, see:
https://code.launchpad.net/~openerp-community/openobject-client-web/stefan-therp_lp759896-6.0/+merge/57552

This branch removes the offensive part of the code from xmo@xxxxxxxxxxx-20110408092415-sevvdlk3t5xkyxx3 while retaining the fix for lp:753340 that it provides.

-- 
https://code.launchpad.net/~openerp-community/openobject-client-web/stefan-therp_lp759896-6.0/+merge/57552
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openobject-client-web/stefan-therp_lp759896-6.0.

=== modified file 'addons/openerp/controllers/tree.py'
--- addons/openerp/controllers/tree.py	2011-04-07 11:47:04 +0000
+++ addons/openerp/controllers/tree.py	2011-04-13 18:14:26 +0000
@@ -202,10 +202,6 @@
             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}