From fce45c3361ac55292fc545bdf17b33e37a3dd242 Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Wed, 12 Apr 2017 14:33:06 +0200 Subject: [PATCH] [FIX] web: field_utils: correctly format many2manys --- addons/web/static/src/js/fields/field_utils.js | 4 ++-- addons/web/static/tests/fields/field_utils_tests.js | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/fields/field_utils.js b/addons/web/static/src/js/fields/field_utils.js index e529e6080d6..a086ebefd15 100644 --- a/addons/web/static/src/js/fields/field_utils.js +++ b/addons/web/static/src/js/fields/field_utils.js @@ -183,9 +183,9 @@ function formatMany2one(value) { */ function formatMany2Many(value) { if (value.data.length === 0) { - return value.data.length + _t('0 records'); + return _t('No records'); } else if (value.data.length === 1) { - return value.data.length + _t('1 record'); + return _t('1 record'); } else { return value.data.length + _t(' records'); } diff --git a/addons/web/static/tests/fields/field_utils_tests.js b/addons/web/static/tests/fields/field_utils_tests.js index 5b3eb267714..60995df21a7 100644 --- a/addons/web/static/tests/fields/field_utils_tests.js +++ b/addons/web/static/tests/fields/field_utils_tests.js @@ -70,12 +70,20 @@ QUnit.test("format_many2one", function (assert) { })); }); - -QUnit.test('formatting chars', function(assert) { +QUnit.test('format char', function(assert) { assert.expect(1); assert.strictEqual(fieldUtils.format.char(), '', "undefined char should be formatted as an empty string"); }); + +QUnit.test('format many2many', function(assert) { + assert.expect(3); + + assert.strictEqual(fieldUtils.format.many2many({data: []}), 'No records'); + assert.strictEqual(fieldUtils.format.many2many({data: [1]}), '1 record'); + assert.strictEqual(fieldUtils.format.many2many({data: [1, 2]}), '2 records'); +}); + }); });