odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] rooted application menus incorrectly, fixed tests 

bzr revid: xmo@openerp.com-20110321154034-tqd03u8u7tpxm5vc
This commit is contained in:
Xavier Morel 2011-03-21 16:40:34 +01:00
parent d40743d0e3
commit 3b3494b27e
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/base/controllers/main.py
View File

@ -139,8 +139,10 @@ class Menu(openerpweb.Controller):
# make a tree using parent_id
menu_items_map = dict((menu_item["id"], menu_item) for menu_item in menu_items)
for menu_item in menu_items:
if not menu_item['parent_id']: continue
parent = menu_item['parent_id'][0]
if menu_item['parent_id']:
parent = menu_item['parent_id'][0]
else:
parent = False
if parent in menu_items_map:
menu_items_map[parent].setdefault(
'children', []).append(menu_item)

16
addons/base/tests/test_menu.py
View File

@ -39,9 +39,9 @@ class LoadTest(unittest2.TestCase):
def test_applications_sort(self):
self.menus_mock.search = mock.Mock(return_value=[1, 2, 3])
self.menus_mock.read = mock.Mock(return_value=[
{'id': 2, 'sequence': 3, 'parent_id': [False, '']},
{'id': 3, 'sequence': 2, 'parent_id': [False, '']},
{'id': 1, 'sequence': 1, 'parent_id': [False, '']},
{'id': 2, 'sequence': 3, 'parent_id': False},
{'id': 3, 'sequence': 2, 'parent_id': False},
{'id': 1, 'sequence': 1, 'parent_id': False},
])
root = self.menu.do_load(self.request)
@ -53,19 +53,19 @@ class LoadTest(unittest2.TestCase):
root['children'],
[{
'id': 1, 'sequence': 1,
'parent_id': [False, ''], 'children': []
'parent_id': False, 'children': []
}, {
'id': 3, 'sequence': 2,
'parent_id': [False, ''], 'children': []
'parent_id': False, 'children': []
}, {
'id': 2, 'sequence': 3,
'parent_id': [False, ''], 'children': []
'parent_id': False, 'children': []
}])
def test_deep(self):
self.menus_mock.search = mock.Mock(return_value=[1, 2, 3, 4])
self.menus_mock.read = mock.Mock(return_value=[
{'id': 1, 'sequence': 1, 'parent_id': [False, '']},
{'id': 1, 'sequence': 1, 'parent_id': False},
{'id': 2, 'sequence': 2, 'parent_id': [1, '']},
{'id': 3, 'sequence': 1, 'parent_id': [2, '']},
{'id': 4, 'sequence': 2, 'parent_id': [2, '']},
@ -78,7 +78,7 @@ class LoadTest(unittest2.TestCase):
[{
'id': 1,
'sequence': 1,
'parent_id': [False, ''],
'parent_id': False,
'children': [{
'id': 2,
'sequence': 2,

1
doc/source/index.rst
View File

@ -25,4 +25,3 @@ Indices and tables
* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`