From e688de835f12710245313367a8041fe2c841b32f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 12 Dec 2011 15:16:56 +0100 Subject: [PATCH] [FIX] correctly take in account default group_by (from action context) group_by are alternative: use the one from the search view if there is one otherwise use the one from the action and default is no group by lp bug: https://launchpad.net/bugs/902302 fixed bzr revid: xmo@openerp.com-20111212141656-w41nnfhzw9kcu93k --- addons/web/static/src/js/views.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index f983cd71cc8..ac1451cd55f 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -346,15 +346,19 @@ session.web.ViewManager = session.web.Widget.extend(/** @lends session.web.View }, do_searchview_search: function(domains, contexts, groupbys) { var self = this, - controller = this.views[this.active_view].controller; + controller = this.views[this.active_view].controller, + action_context = this.action.context || {}; this.rpc('/web/session/eval_domain_and_context', { domains: [this.action.domain || []].concat(domains || []), - contexts: [this.action.context || {}].concat(contexts || []), + contexts: [action_context].concat(contexts || []), group_by_seq: groupbys || [] }, function (results) { self.dataset.context = results.context; self.dataset.domain = results.domain; - controller.do_search(results.domain, results.context, results.group_by); + var groupby = results.group_by.length + ? results.group_by + : action_context.group_by; + controller.do_search(results.domain, results.context, groupby || []); }); }, /**