diff --git a/addons/web/http.py b/addons/web/http.py index fae8b691310..040022b3069 100644 --- a/addons/web/http.py +++ b/addons/web/http.py @@ -563,7 +563,7 @@ class Root(object): controllers and configure them. """ for addons_path in openerp.modules.module.ad_paths: - for module in sorted(os.listdir(addons_path)): + for module in sorted(os.listdir(str(addons_path))): if module not in addons_module: manifest_path = os.path.join(addons_path, module, '__openerp__.py') path_static = os.path.join(addons_path, module, 'static') diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 396342b5f6e..509f8f751d4 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -950,6 +950,10 @@ instance.web.Menu = instance.web.Widget.extend({ }, do_load_needaction: function (menu_ids) { var self = this; + menu_ids = _.reject(menu_ids, _.isEmpty); + if (_.isEmpty(menu_ids)) { + return $.when(); + } return this.rpc("/web/menu/load_needaction", {'menu_ids': menu_ids}).done(function(r) { self.on_needaction_loaded(r); }); @@ -1087,9 +1091,11 @@ instance.web.Menu = instance.web.Widget.extend({ }, do_reload_needaction: function () { var self = this; - self.do_load_needaction([self.current_menu]).then(function () { - self.trigger("need_action_reloaded"); - }); + if (self.current_menu) { + self.do_load_needaction([self.current_menu]).then(function () { + self.trigger("need_action_reloaded"); + }); + } }, /** * Jquery event handler for menu click