diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-03-28 16:17:09 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-03-28 16:17:09 +0200 |
| commit | c37f1f6cb9eba0658129bfb34bc230d404761856 (patch) | |
| tree | 9356467c315c377bc23b58513bb9cb73dea1b81a /addons/web/static/src/js | |
| parent | 26df9e8900558bf267bfcc6b3e2a4217bd7b731e (diff) | |
| parent | 8bab7aebd62a3638a826388e8677ec08ce6e7098 (diff) | |
[MERGE] forward port branch saas-11 up to 8bab7aebd62
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/framework/pyeval.js | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/list_view.js | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/addons/web/static/src/js/framework/pyeval.js b/addons/web/static/src/js/framework/pyeval.js index 0430aee9274..bcab0b0717f 100644 --- a/addons/web/static/src/js/framework/pyeval.js +++ b/addons/web/static/src/js/framework/pyeval.js @@ -852,6 +852,7 @@ function eval_domains (domains, evaluation_context) { var result_domain = []; // Normalize only if the first domain is the array ["|"] or ["!"] var need_normalization = ( + domains && domains.length > 0 && domains[0].length === 1 && (domains[0][0] === "|" || domains[0][0] === "!") diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js index 83420da2ace..dddc2b1bcf3 100644 --- a/addons/web/static/src/js/views/list_view.js +++ b/addons/web/static/src/js/views/list_view.js @@ -939,9 +939,11 @@ ListView.List = Class.extend({ $row = self.$current.children( '[data-id=' + record.get('id') + ']'); } - var $newRow = $(self.render_record(record)); - $newRow.find('.o_list_record_selector input').prop('checked', !!$row.find('.o_list_record_selector input').prop('checked')); - $row.replaceWith($newRow); + if ($row.length) { + var $newRow = $(self.render_record(record)); + $newRow.find('.o_list_record_selector input').prop('checked', !!$row.find('.o_list_record_selector input').prop('checked')); + $row.replaceWith($newRow); + } }, 'add': function (ev, records, record, index) { var $new_row = $(self.render_record(record)); |