[MERGE] Forward-port of 7.0 bugfixes, up to rev. 3915

revision-id: odo@openerp.com-20130503102248-vjl1b8xju9uwfq97

bzr revid: odo@openerp.com-20130503102451-nynkrrpldrafyv3i

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')

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