summaryrefslogtreecommitdiff
path: root/addons/web
diff options
context:
space:
mode:
authorAaron Bohy <aab@odoo.com>2017-08-29 13:41:28 +0200
committerAaron Bohy <aab@odoo.com>2017-08-29 13:59:49 +0200
commit4f61e7f0481fa2e2bfd806d92ea77f07b78d42de (patch)
tree7f48d41776b67e5940766b9af989acbd3d6141ed /addons/web
parentc5bf53682e159343ee0c707f6d7f2da972d6add2 (diff)
[FIX] web: WidgetDomain: don't crash on false domain
Before this rev., when the value of a field with widget='domain' was false, the search_count RPC made to display the number of records matching the domain crashed, and the widget displayed that the domain was invalid. This rev. adds a fallback on [] when the domain is false.
Diffstat (limited to 'addons/web')
-rw-r--r--addons/web/static/src/js/views/basic/basic_model.js2
-rw-r--r--addons/web/static/tests/fields/basic_fields_tests.js38
2 files changed, 39 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index aa0aab7aa64..9dc544ba84f 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -2043,7 +2043,7 @@ var BasicModel = AbstractModel.extend({
if (record.data.hasOwnProperty(domainModel)) {
domainModel = record._changes && record._changes[domainModel] || record.data[domainModel];
}
- var domainValue = record._changes && record._changes[fieldName] || record.data[fieldName];
+ var domainValue = record._changes && record._changes[fieldName] || record.data[fieldName] || [];
// avoid rpc if not necessary
var hasChanged = this._saveSpecialDataCache(record, fieldName, {
diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js
index 984fa156d9c..c33cb8a4151 100644
--- a/addons/web/static/tests/fields/basic_fields_tests.js
+++ b/addons/web/static/tests/fields/basic_fields_tests.js
@@ -3757,6 +3757,44 @@ QUnit.module('basic_fields', {
"field selector popover should contain 'Color index' field");
form.destroy();
});
+
+ QUnit.test('domain field: handle false domain as []', function (assert) {
+ assert.expect(2);
+
+ this.data.partner.records[0].foo = false;
+ this.data.partner.fields.bar.type = "char";
+ this.data.partner.records[0].bar = "product";
+
+ var form = createView({
+ View: FormView,
+ model: 'partner',
+ data: this.data,
+ arch:
+ '<form>' +
+ '<sheet>' +
+ '<group>' +
+ '<field name="bar"/>' +
+ '<field name="foo" widget="domain" options="{\'model\': \'bar\'}"/>' +
+ '</group>' +
+ '</sheet>' +
+ '</form>',
+ mockRPC: function (route, args) {
+ if (args.method === 'search_count') {
+ assert.deepEqual(args.args[0], [], "should send a valid domain");
+ }
+ return this._super.apply(this, arguments);
+ },
+ res_id: 1,
+ viewOptions: {
+ mode: 'edit',
+ },
+ });
+
+ var $warning = form.$('.o_field_widget[name=foo] .text-warning');
+ assert.strictEqual($warning.length, 0, "should not display that the domain is invalid");
+
+ form.destroy();
+ });
});
});
});