Merge lp:~openerp-dev/openobject-addons/trunk-click-all-menu-chm into lp:openobject-addons

Proposed by Christophe Matthieu (OpenERP)
Status: Work in progress
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-click-all-menu-chm
Merge into: lp:openobject-addons
Diff against target: 12 lines (+1/-1)
1 file modified
board/static/src/js/dashboard.js (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-click-all-menu-chm
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+218300@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

9408. By Christophe Matthieu (OpenERP)

[FIX] board: menu.data.data => menu.data

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'board/static/src/js/dashboard.js'
--- board/static/src/js/dashboard.js 2014-04-24 15:02:55 +0000
+++ board/static/src/js/dashboard.js 2014-05-05 15:17:15 +0000
@@ -345,7 +345,7 @@
345 },345 },
346 _x:function() {346 _x:function() {
347 if (!instance.webclient) { return $.Deferred().reject(); }347 if (!instance.webclient) { return $.Deferred().reject(); }
348 var dashboard_menu = instance.webclient.menu.data.data.children;348 var dashboard_menu = instance.webclient.menu.data.children;
349 return new instance.web.Model('ir.model.data')349 return new instance.web.Model('ir.model.data')
350 .query(['res_id'])350 .query(['res_id'])
351 .filter([['name','=','menu_reporting_dashboard']])351 .filter([['name','=','menu_reporting_dashboard']])

Subscribers

People subscribed via source and target branches

to all changes: