Merge lp:~xmo-deactivatedaccount/openobject-client-web/trunk-dev-fix-childrenless-menus into lp:~openerp-dev/openobject-client-web/trunk-dev-web

Proposed by Xavier (Open ERP)
Status: Merged
Merged at revision: 2961
Proposed branch: lp:~xmo-deactivatedaccount/openobject-client-web/trunk-dev-fix-childrenless-menus
Merge into: lp:~openerp-dev/openobject-client-web/trunk-dev-web
Diff against target: 25 lines (+2/-2)
2 files modified
addons/openerp/widgets/tree_view.py (+1/-1)
addons/openerp/widgets/treegrid.py (+1/-1)
To merge this branch: bzr merge lp:~xmo-deactivatedaccount/openobject-client-web/trunk-dev-fix-childrenless-menus
Reviewer Review Type Date Requested Status
Navrang Oza (community) approve Approve
Amit Mendapara Pending
Review via email: mp+21955@code.launchpad.net

Description of the change

Fix issue with child-less menu item (e.g. last item of the Administration menu) generating a traceback on the server due to requesting the id "0".

I don't think there's any reason that it would break anything, but I'd like to stop breaking stuff so if you could review it...

To post a comment you must log in.
Revision history for this message
Navrang Oza (noz-tiny) wrote :

[FIX] Menu without Children problem.

review: Approve (approve)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/widgets/tree_view.py'
2--- addons/openerp/widgets/tree_view.py 2010-03-08 11:44:48 +0000
3+++ addons/openerp/widgets/tree_view.py 2010-03-23 16:45:34 +0000
4@@ -102,7 +102,7 @@
5 model=self.model,
6 headers=self.headers,
7 url=url("/tree/data"),
8- ids=ids or 0,
9+ ids=ids,
10 domain=self.domain,
11 context=self.context,
12 field_parent=self.field_parent,
13
14=== modified file 'addons/openerp/widgets/treegrid.py'
15--- addons/openerp/widgets/treegrid.py 2010-03-08 11:44:48 +0000
16+++ addons/openerp/widgets/treegrid.py 2010-03-23 16:45:34 +0000
17@@ -55,7 +55,7 @@
18 icon_name = headers[0].get('icon')
19
20 params = dict(model=model,
21- ids=ids,
22+ ids=ids or '',
23 fields=ustr(fields),
24 domain=ustr(domain),
25 context=ustr(context),

Subscribers

People subscribed via source and target branches