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

[IMP] cleanup menu method mess 

do_* were introduce for testing this is not needed anymore

bzr revid: al@openerp.com-20121211021338-8s3jqpfraku1tmsj
This commit is contained in:
Antony Lesuisse 2012-12-11 03:13:38 +01:00
parent c4fcf264c0
commit f83bfeff0b
3 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
addons/web/controllers/main.py
View File

@ -523,11 +523,7 @@ html_template = """<!DOCTYPE html>
<body> <body>
<!--[if lte IE 8]> <!--[if lte IE 8]>
<script src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script> <script src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
<script> <script>CFInstall.check({mode: "overlay"});</script>
CFInstall.check({
mode: "overlay"
});
</script>
<![endif]--> <![endif]-->
</body> </body>
</html> </html>
@ -909,19 +905,8 @@ class Session(openerpweb.Controller):
class Menu(openerpweb.Controller): class Menu(openerpweb.Controller):
_cp_path = "/web/menu" _cp_path = "/web/menu"
@openerpweb.jsonrequest
def load(self, req):
return {'data': self.do_load(req)}
@openerpweb.jsonrequest
def load_needaction(self, req, menu_ids):
return {'data': self.do_load_needaction(req, menu_ids)}
@openerpweb.jsonrequest @openerpweb.jsonrequest
def get_user_roots(self, req): def get_user_roots(self, req):
return self.do_get_user_roots(req)
def do_get_user_roots(self, req):
""" Return all root menu ids visible for the session user. """ Return all root menu ids visible for the session user.
:param req: A request object, with an OpenERP session attribute :param req: A request object, with an OpenERP session attribute
@ -944,7 +929,8 @@ class Menu(openerpweb.Controller):
return Menus.search(menu_domain, 0, False, False, req.context) return Menus.search(menu_domain, 0, False, False, req.context)
def do_load(self, req): @openerpweb.jsonrequest
def load(self, req):
""" Loads all menu items (all applications and their sub-menus). """ Loads all menu items (all applications and their sub-menus).
:param req: A request object, with an OpenERP session attribute :param req: A request object, with an OpenERP session attribute
@ -956,7 +942,7 @@ class Menu(openerpweb.Controller):
fields = ['name', 'sequence', 'parent_id', 'action', fields = ['name', 'sequence', 'parent_id', 'action',
'needaction_enabled'] 'needaction_enabled']
menu_roots = Menus.read(self.do_get_user_roots(req), fields, req.context) menu_roots = Menus.read(self.get_user_roots(req), fields, req.context)
menu_root = { menu_root = {
'id': False, 'id': False,
'name': 'root', 'name': 'root',
@ -992,7 +978,8 @@ class Menu(openerpweb.Controller):
return menu_root return menu_root
def do_load_needaction(self, req, menu_ids=False): @openerpweb.jsonrequest
def load_needaction(self, req, menu_ids=False):
""" Loads needaction counters for all or some specific menu ids. """ Loads needaction counters for all or some specific menu ids.
:return: needaction data :return: needaction data
@ -1008,6 +995,7 @@ class Menu(openerpweb.Controller):
@openerpweb.jsonrequest @openerpweb.jsonrequest
def action(self, req, menu_id): def action(self, req, menu_id):
# still used by web_shortcut
actions = load_actions_from_ir_values(req,'action', 'tree_but_open', actions = load_actions_from_ir_values(req,'action', 'tree_but_open',
[('ir.ui.menu', menu_id)], False) [('ir.ui.menu', menu_id)], False)
return {"action": actions} return {"action": actions}

4
addons/web/static/src/js/chrome.js
View File

@ -826,7 +826,7 @@ instance.web.Menu = instance.web.Widget.extend({
}, },
menu_loaded: function(data) { menu_loaded: function(data) {
var self = this; var self = this;
this.data = data; this.data = {data: data};
this.renderElement(); this.renderElement();
this.limit_entries(); this.limit_entries();
// Hide toplevel item if there is only one // Hide toplevel item if there is only one
@ -847,7 +847,7 @@ instance.web.Menu = instance.web.Widget.extend({
on_needaction_loaded: function(data) { on_needaction_loaded: function(data) {
var self = this; var self = this;
this.needaction_data = data; this.needaction_data = data;
_.each(this.needaction_data.data, function (item, menu_id) { _.each(this.needaction_data, function (item, menu_id) {
var $item = self.$secondary_menus.find('a[data-menu="' + menu_id + '"]'); var $item = self.$secondary_menus.find('a[data-menu="' + menu_id + '"]');
$item.remove('oe_menu_counter'); $item.remove('oe_menu_counter');
if (item.needaction_counter && item.needaction_counter > 0) { if (item.needaction_counter && item.needaction_counter > 0) {

6
addons/web/tests/test_menu.py
View File

@ -36,7 +36,7 @@ class LoadTest(unittest2.TestCase):
self.MockMenus.search.return_value = [] self.MockMenus.search.return_value = []
self.MockMenus.read.return_value = [] self.MockMenus.read.return_value = []
root = self.menu.do_load(self.request) root = self.menu.load(self.request)
self.MockMenus.search.assert_called_with( self.MockMenus.search.assert_called_with(
[], 0, False, False, self.request.context) [], 0, False, False, self.request.context)
@ -57,7 +57,7 @@ class LoadTest(unittest2.TestCase):
{'id': 2, 'sequence': 3, 'parent_id': False}, {'id': 2, 'sequence': 3, 'parent_id': False},
] ]
root = self.menu.do_load(self.request) root = self.menu.load(self.request)
self.MockMenus.read.assert_called_with( self.MockMenus.read.assert_called_with(
[1, 2, 3], ['name', 'sequence', 'parent_id', [1, 2, 3], ['name', 'sequence', 'parent_id',
@ -90,7 +90,7 @@ class LoadTest(unittest2.TestCase):
{'id': 4, 'sequence': 2, 'parent_id': [2, '']}, {'id': 4, 'sequence': 2, 'parent_id': [2, '']},
]) ])
root = self.menu.do_load(self.request) root = self.menu.load(self.request)
self.assertEqual( self.assertEqual(
root['children'], root['children'],