Merge lp:~camptocamp/ocb-web/7.0-ContextGroupByPropagationIssue-1101840 into lp:ocb-web

[Guewen Baconnier @ Camptocamp]

[FIX] Web: Refixed the issue of context propagation, also removed the view references of current dataset.

Mirroring: https://code.launchpad.net/~openerp-dev/openerp-web/7.0-opw-601491ContextGroupByPropagationIssue-msh

Fixes: lp:1101840

Already fixed in trunk.

Author: Mohammed Shekha(OpenERP) <email address hidden>

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Thanks for the MP

LGTM

review: Approve (no test, code review)

[Pedro Manuel Baeza (pedro.baeza)]

LGTM, same as official patch.

Regards.

review: Approve (code review)

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks for backporting this!

review: Approve (test)

[Stefan Rijnhart (Opener) (stefan-opener)]

Just to say that the upstream patch has become a little more elaborate in the mean time. I'll 'abstain' until I can test that solution, at least against the issue reported in the bug thread https://bugs.launchpad.net/ocb-web/+bug/1101840/comments/7

review: Abstain

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> Just to say that the upstream patch has become a little more elaborate in the
> mean time. I'll 'abstain' until I can test that solution, at least against the
> issue reported in the bug thread https://bugs.launchpad.net/ocb-
> web/+bug/1101840/comments/7

The upstream patch also got a fix for another bug: https://bugs.launchpad.net/openerp-web/+bug/1263888
I'm testing it and will update this branch.

[lp:~camptocamp/ocb-web/7.0-ContextGroupByPropagationIssue-1101840]

4097. By Guewen Baconnier @ Camptocamp on 2014-01-07

[MRG] from lp:ocb-web/7.0

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I tested the upstream patch which worked well.
I updated this branch from the upstream.

[lp:~camptocamp/ocb-web/7.0-ContextGroupByPropagationIssue-1101840]

4098. By Mohammed Shekha(OpenERP)<email address hidden> on 2014-01-07

[MRG] keep in sync with the upstream branch: lp:~openerp-dev/openerp-web/7.0-opw-601491ContextGroupByPropagationIssue-msh

[Stefan Rijnhart (Opener) (stefan-opener)]

I tested the new version of the fix and I confirm that it does not have the regression from the first version while still fixing the related bug.

However, this OCB backport still also contains the first version of the OPW in ll.2-15. In these lines, a context structure is composed but used nowhere. The lines can be safely removed.

review: Needs Fixing

[lp:~camptocamp/ocb-web/7.0-ContextGroupByPropagationIssue-1101840]

4099. By Guewen Baconnier @ Camptocamp on 2014-01-21

remove the first version of the patch

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> I tested the new version of the fix and I confirm that it does not have the
> regression from the first version while still fixing the related bug.
>
> However, this OCB backport still also contains the first version of the OPW in
> ll.2-15. In these lines, a context structure is composed but used nowhere. The
> lines can be safely removed.

Thanks! I removed these lines

[Alexis de Lattre (alexis-via)]

I confirm that this MP solves the bug "Crash when clicking on "Split in Serial Numbers" https://bugs.launchpad.net/ocb-addons/+bug/1271139

So this patch is now in production :)

review: Approve (tests only)

[arthru (arthru)]

Just tested : it works !

review: Approve

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks Guewen. Approved and merged.

review: Approve

[Stefan Rijnhart (Opener) (stefan-opener)]

Reverted this change here: http://bazaar.launchpad.net/~ocb/ocb-web/7.0/revision/4189, because the upstream fix http://bazaar.launchpad.net/~ocb/ocb-web/7.0/revision/4190, while equivalent, is slightly different (takes advantage of existing underscore API instead of copying it in with the fix).

=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js	2013-09-14 12:53:36 +0000
+++ addons/web/static/src/js/views.js	2014-01-21 12:24:25 +0000
@@ -1358,12 +1358,21 @@
         var context = new instance.web.CompoundContext(dataset.get_context(), action_data.context || {});
         var handler = function (action) {
             if (action && action.constructor == Object) {
-                var ncontext = new instance.web.CompoundContext(context);
+                // filter out context keys that are specific to the action model.
+                // Wrong default_ and search_default values will no give the expected views
+                // Wrong group_by values will simply fail and forbid rendering of the destination view
+                var view_refs = _(action.views).map(function(view){return view[1] + '_view_ref';}).join('|');
+                var ncontext = new instance.web.CompoundContext(
+                    self.object(_.reject(self.pairs(dataset.get_context().eval()), function(pair) {
+                      return pair[0].match('^(?:(?:default_|search_default_)|(?:'+view_refs+')|group_by|group_by_no_leaf|active_id|active_ids)$') !== null;
+                    }))
+                );
+                ncontext.add(action_data.context || {});
+                ncontext.add({active_model: dataset.model});
                 if (record_id) {
                     ncontext.add({
                         active_id: record_id,
                         active_ids: [record_id],
-                        active_model: dataset.model
                     });
                 }
                 ncontext.add(action.context || {});
@@ -1407,6 +1416,31 @@
             return dataset.exec_workflow(record_id, action_data.name).then(handler);
         }
     },
+    // Convert an object into a list of `[key, value]` pairs.
+    pairs: function(obj) {
+        var keys = _.keys(obj);
+        var length = keys.length;
+        var pairs = new Array(length);
+        for (var i = 0; i < length; i++) {
+          pairs[i] = [keys[i], obj[keys[i]]];
+        }
+        return pairs;
+    },
+    // Converts lists into objects. Pass either a single array of `[key, value]`
+    // pairs, or two parallel arrays of the same length -- one of keys, and one of
+    // the corresponding values.
+    object: function(list, values) {
+        if (list == null) return {};
+        var result = {};
+        for (var i = 0, length = list.length; i < length; i++) {
+          if (values) {
+            result[list[i]] = values[i];
+          } else {
+            result[list[i][0]] = list[i][1];
+          }
+        }
+        return result;
+    },
     /**
      * Directly set a view to use instead of calling fields_view_get. This method must
      * be called before start(). When an embedded view is set, underlying implementations