Merge lp:~openerp-dev/openerp-web/7.0-bug-1047911-fme into lp:openerp-web/7.0

[Fabien Meghazi (OpenERP)]

This branch fixes the active_id reload bug by pushing the active_id and/or active_ids in the state.
They are popped back on_load_state().

Also added jsdoc for ActionManager#do_action()

[Fabien Meghazi (OpenERP) (fme)]

Fixes bug https://bugs.launchpad.net/openerp-web/+bug/1047911

[Xavier (Open ERP) (xmo-deactivatedaccount)]

> state["active_ids"] = this.inner_action.context.active_ids.toString();

The toString() is a bit iffy, I've got to say I'd prefer an explicit join here, or some other type of serialization

> add_context.active_ids = state.active_ids.toString().split(',').map

Not sure what's toString() supposed to be here, isn't active_ids already a string?

Also the parsing might be a tad risky: what if we have "string" or "virtual" ids in that? They're going to be parseInt'd to NaN.

review: Needs Fixing

[lp:~openerp-dev/openerp-web/7.0-bug-1047911-fme]

3751. By Fabien Meghazi (OpenERP) on 2013-02-12

[IMP] Improved code and doc

3752. By Fabien Meghazi (OpenERP) on 2013-02-12

[FIX] support virtual ids

[Fabien Meghazi (OpenERP) (fme)]

> > state["active_ids"] = this.inner_action.context.active_ids.toString();
>
> The toString() is a bit iffy, I've got to say I'd prefer an explicit join here, or some other type of serialization

I was relying on the ecma spec but I admit it's biffy. Sorry, I meant iffy.

> > add_context.active_ids = state.active_ids.toString().split(',').map
>
> Not sure what's toString() supposed to be here, isn't active_ids already a string?

No because jQuery BBQ does some parsing in some case. I've documented it.

> Also the parsing might be a tad risky: what if we have "string" or "virtual" ids in that? They're going to be parseInt'd to NaN.

Fixed that

[lp:~openerp-dev/openerp-web/7.0-bug-1047911-fme]

3753. By Fabien Meghazi (OpenERP) on 2013-02-12

[END] This is the end of the world

[Xavier (Open ERP) (xmo-deactivatedaccount)]

review: Approve

=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js	2013-02-05 12:09:50 +0000
+++ addons/web/static/src/js/views.js	2013-02-12 13:32:20 +0000
@@ -190,6 +190,14 @@
                     });
                     state = _.extend(params || {}, state);
                 }
+                if (this.inner_action.context) {
+                    if (this.inner_action.context.active_id) {
+                        state["active_id"] = this.inner_action.context.active_id;
+                    }
+                    if (this.inner_action.context.active_ids) {
+                        state["active_ids"] = this.inner_action.context.active_ids.join(',');
+                    }
+                }
             }
             if(!this.dialog) {
                 this.getParent().do_push_state(state);
@@ -212,8 +220,20 @@
             } else {
                 var run_action = (!this.inner_widget || !this.inner_widget.action) || this.inner_widget.action.id !== state.action;
                 if (run_action) {
+                    var add_context = {};
+                    if (state.active_id) {
+                        add_context.active_id = state.active_id;
+                    }
+                    if (state.active_ids) {
+                        // The jQuery BBQ plugin does some parsing on values that are valid integers.
+                        // It means that if there's only one item, it will do parseInt() on it,
+                        // otherwise it will keep the comma seperated list as string.
+                        add_context.active_ids = state.active_ids.toString().split(',').map(function(id) {
+                            return parseInt(id, 10) || id;
+                        });
+                    }
                     this.null_action();
-                    action_loaded = this.do_action(state.action);
+                    action_loaded = this.do_action(state.action, { additional_context: add_context });
                     $.when(action_loaded || null).done(function() {
                         instance.webclient.menu.has_been_loaded.done(function() {
                             if (self.inner_action && self.inner_action.id) {
@@ -249,12 +269,25 @@
             }
         });
     },
+    /**
+     * Execute an OpenERP action
+     *
+     * @param {Number|String|Object} Can be either an action id, a client action or an action descriptor.
+     * @param {Object} [options]
+     * @param {Boolean} [options.clear_breadcrumbs=false] Clear the breadcrumbs history list
+     * @param {Function} [options.on_reverse_breadcrumb] Callback to be executed whenever an anterior breadcrumb item is clicked on.
+     * @param {Function} [options.on_close] Callback to be executed when the dialog is closed (only relevant for target=new actions)
+     * @param {Function} [options.action_menu_id] Manually set the menu id on the fly.
+     * @param {Object} [options.additional_context] Additional context to be merged with the action's context.
+     * @return {jQuery.Deferred} Action loaded
+     */
     do_action: function(action, options) {
         options = _.defaults(options || {}, {
             clear_breadcrumbs: false,
             on_reverse_breadcrumb: function() {},
             on_close: function() {},
             action_menu_id: null,
+            additional_context: {},
         });
         if (action === false) {
             action = { type: 'ir.actions.act_window_close' };
@@ -269,15 +302,13 @@
         }
 
         // Ensure context & domain are evaluated and can be manipulated/used
-        if (action.context) {
-            action.context = instance.web.pyeval.eval(
-                'context', action.context);
-            if (action.context.active_id || action.context.active_ids) {
-                // Here we assume that when an `active_id` or `active_ids` is used
-                // in the context, we are in a `related` action, so we disable the
-                // searchview's default custom filters.
-                action.context.search_disable_custom_filters = true;
-            }
+        var ncontext = new instance.web.CompoundContext(options.additional_context, action.context || {});
+        action.context = instance.web.pyeval.eval('context', ncontext);
+        if (action.context.active_id || action.context.active_ids) {
+            // Here we assume that when an `active_id` or `active_ids` is used
+            // in the context, we are in a `related` action, so we disable the
+            // searchview's default custom filters.
+            action.context.search_disable_custom_filters = true;
         }
         if (action.domain) {
             action.domain = instance.web.pyeval.eval(