From 0979b3b6fc24f9cbc6a88aff58f93137fb5c1807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 25 Jul 2013 17:02:43 +0200 Subject: [PATCH] [IMP] view_list: better active_domain computation bzr revid: tde@openerp.com-20130725150243-or624rj2qw6dgxiz --- addons/web/static/src/js/view_list.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index e4059ce9026..975e2a2d248 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -805,14 +805,13 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi if (this.$('.oe_list_record_selector').prop('checked')) { var search_view = this.getParent().searchview; var search_data = search_view.build_search_data(); - var active_domain_done = instance.web.pyeval.eval_domains_and_contexts({ + return instance.web.pyeval.eval_domains_and_contexts({ domains: search_data.domains, contexts: search_data.contexts, group_by_seq: search_data.groupbys || [] - }).done(function (results) { + }).then(function (results) { return results.domain; }); - return active_domain_done; } else { return $.Deferred().resolve(); @@ -980,10 +979,6 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web. e.stopPropagation(); var selection = self.get_selection(); var checked = $(e.currentTarget).find('input').prop('checked'); - // console.log(checked); - // if (! checked) { - // $(self).find('.oe_list_record_selector').prop('checked', false); - // } $(self).trigger( 'selected', [selection.ids, selection.records, ! checked]); })