diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-04-30 16:04:23 +0200 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-04-30 16:04:23 +0200 |
| commit | a6b25061ba461c12b22a8945e43134a0bc79d5ee (patch) | |
| tree | 60b5e702f1f31324e36d2d51b7b1b777994b2cb4 /addons/web/controllers | |
| parent | 1f693aaed6f6e28a384f20d357f8a3f558d33f6a (diff) | |
| parent | 7dedde91eff41752724efcbbefa5e0ca7e1ae3e0 (diff) | |
[MERGE] merge from trunk
bzr revid: ged@openerp.com-20140430085942-umusyhp4cs2ffezj
bzr revid: ged@openerp.com-20140430140423-kq0vdboq1mux4zfn
Diffstat (limited to 'addons/web/controllers')
| -rw-r--r-- | addons/web/controllers/main.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index f2101b27fd3..5bf31d341ac 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1088,16 +1088,7 @@ class Menu(http.Controller): """ s = request.session Menus = s.model('ir.ui.menu') - # If a menu action is defined use its domain to get the root menu items - user_menu_id = s.model('res.users').read([s.uid], ['menu_id'], - request.context)[0]['menu_id'] - menu_domain = [('parent_id', '=', False)] - if user_menu_id: - domain_string = s.model('ir.actions.act_window').read( - [user_menu_id[0]], ['domain'],request.context)[0]['domain'] - if domain_string: - menu_domain = ast.literal_eval(domain_string) return Menus.search(menu_domain, 0, False, False, request.context) |