[MERGE] trunk

bzr revid: csaba.toth@i3rendszerhaz.hu-20121129114132-gfe3sn1p5t0mzofm
2012-11-29 12:41:32 +01:00
parent e2435d4f00 c7772fdd82
commit 76ca47d4fd
63 changed files with 6789 additions and 2130 deletions
@@ -1264,11 +1264,12 @@ instance.web.WebClient = instance.web.Client.extend({
        var self = this;
        return this.rpc("/web/action/load", { action_id: options.action_id })
            .then(function (result) {
-                var action = result;
                if (options.needaction) {
-                    action.context.search_default_message_unread = true;
+                    result.context = new instance.web.CompoundContext(
+                        result.context,
+                        {search_default_message_unread: true});
                }
-                return $.when(self.action_manager.do_action(action, {
+                return $.when(self.action_manager.do_action(result, {
                    clear_breadcrumbs: true,
                    action_menu_id: self.menu.current_menu,
                })).fail(function() {