Merge lp:~openerp-dev/openerp-web/7.0-action-id-user-mat into lp:openerp-web/7.0

[Martin Trigaux (OpenERP)]

Fixing the broken field 'action_id' on res.users when going 6.1 -> 7

=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js	2014-01-07 16:11:54 +0000
+++ addons/web/static/src/js/chrome.js	2014-02-14 11:27:21 +0000
@@ -1407,12 +1407,18 @@
         $(window).bind('hashchange', this.on_hashchange);
 
         var state = $.bbq.getState(true);
+
         if (_.isEmpty(state) || state.action == "login") {
             self.menu.has_been_loaded.done(function() {
-                var first_menu_id = self.menu.$el.find("a:first").data("menu");
-                if(first_menu_id) {
-                    self.menu.menu_click(first_menu_id);
-                }
+                new instance.web.Model("res.users").call("read", [self.session.uid, ["action_id"]]).done(function(data) {
+                    var first_menu_id = self.menu.$el.find("a:first").data("menu");
+                    if(first_menu_id)
+                        self.menu.menu_click(first_menu_id);
+
+                    if(data.action_id) {
+                        self.action_manager.do_action(data.action_id[0]);
+                    }
+                });
             });
         } else {
             $(window).trigger('hashchange');