summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Geubelle <mge@odoo.com>2017-05-02 11:50:56 +0200
committerMartin Geubelle <mge@odoo.com>2017-05-04 11:58:25 +0200
commitc6a0ff52f9727b18f888d6bf8a16c6fdca88d021 (patch)
tree5a105cee16c5648c7692ed0d03a8176b5bacec49
parent34cf2bc51c77bc4ed13dd300d03572b0607434b3 (diff)
[FIX] web: Kanban: fallback on empty array for x2many raw_value
The commit e07f27d has wrongly changed the fallback for one2many raw_value from an empty array to `false`. This modification brokes a lot of templates where we assume that the value is always an array. This commit restores the previous behavior with the fallback on [].
-rw-r--r--addons/web/static/src/js/views/kanban/kanban_record.js2
-rw-r--r--addons/web/static/tests/views/kanban_tests.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/kanban/kanban_record.js b/addons/web/static/src/js/views/kanban/kanban_record.js
index 5434ed7da72..c22a10ce6e6 100644
--- a/addons/web/static/src/js/views/kanban/kanban_record.js
+++ b/addons/web/static/src/js/views/kanban/kanban_record.js
@@ -368,7 +368,7 @@ var KanbanRecord = Widget.extend({
if ((r.type === 'date' || r.type === 'datetime') && value) {
r.raw_value = value.toDate();
} else if (r.type === 'one2many' || r.type === 'many2many') {
- r.raw_value = value.count ? value.res_ids : false;
+ r.raw_value = value.count ? value.res_ids : [];
} else if (r.type === 'many2one' ) {
r.raw_value = value && value.res_id || false;
} else {
diff --git a/addons/web/static/tests/views/kanban_tests.js b/addons/web/static/tests/views/kanban_tests.js
index d7ef88d4c94..d804ab35d71 100644
--- a/addons/web/static/tests/views/kanban_tests.js
+++ b/addons/web/static/tests/views/kanban_tests.js
@@ -1031,7 +1031,7 @@ QUnit.module('Views', {
'<templates><t t-name="kanban-box">' +
'<div>' +
'<button t-if="!record.product_id.raw_value" class="btn_a">A</button>' +
- '<button t-if="!record.category_ids.raw_value" class="btn_b">B</button>' +
+ '<button t-if="!record.category_ids.raw_value.length" class="btn_b">B</button>' +
'</div>' +
'</t></templates>' +
'</kanban>',