Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] web: inconsistent daterange validation #162000

Draft
wants to merge 1 commit into
base: 17.0
Choose a base branch
from
Draft

[FIX] web: inconsistent daterange validation #162000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions addons/web/static/src/views/fields/datetime/datetime_field.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,17 @@ export const dateRangeField = {
},
],
supportedTypes: ["date", "datetime"],
isValid: (record, fieldname, fieldInfo) => {
if (fieldInfo.widget === "daterange") {
if (fieldInfo.options.end_date_field && (!record.data[fieldInfo.options.end_date_field] !== !record.data[fieldname])) {
return false;
}
if (fieldInfo.options.start_date_field && (!record.data[fieldInfo.options.start_date_field] !== !record.data[fieldname])) {
return false;
}
}
return !record.isFieldInvalid(fieldname);
}
};

registry
Expand Down
2 changes: 1 addition & 1 deletion addons/web/static/src/views/fields/field.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export function fieldVisualFeedback(field, record, fieldName, fieldInfo) {
return {
readonly,
required,
invalid: record.isFieldInvalid(fieldName),
invalid: field.isValid ? !field.isValid(record, fieldName, fieldInfo) : record.isFieldInvalid(fieldName),
empty,
};
}
Expand Down
52 changes: 52 additions & 0 deletions addons/web/static/tests/views/fields/daterange_field_tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,4 +1240,56 @@ QUnit.module("Fields", (hooks) => {
assert.containsOnce(target, ".fa-long-arrow-right");
}
);

QUnit.test("invalid empty date with optional end date",
async (assert) => {
serverData.models.partner.fields.date_end = { string: "Date End", type: "date" };
serverData.models.partner.records[0].date_end = "2017-02-08";
await makeView({
type: "form",
resModel: "partner",
serverData,
arch: `
<form>
<label for="date" string="Daterange" />
<field name="date" widget="daterange" options="{'end_date_field': 'date_end'}" string="Planned Date" required="date or date_end"/>
<field name="date_end" invisible="1" required="date"/>
</form>`,
resId: 1,
});
await editInput(target, "input[data-field=date_end]", "");
await click(target);
assert.hasClass(
target.querySelector(".o_field_daterange"),
"o_field_invalid",
"date field should be displayed as invalid"
);
}
);

QUnit.test("invalid empty date with optional start date",
async (assert) => {
serverData.models.partner.fields.date_end = { string: "Date End", type: "date" };
serverData.models.partner.records[0].date_end = "2017-02-08";
await makeView({
type: "form",
resModel: "partner",
serverData,
arch: `
<form>
<label for="date_end" string="Daterange" />
<field name="date" invisible="1" required="date_end"/>
<field name="date_end" widget="daterange" options="{'start_date_field': 'date'}" string="Planned Date" required="date or date_end"/>
</form>`,
resId: 1,
});
await editInput(target, "input[data-field=date_end]", "");
await click(target);
assert.hasClass(
target.querySelector(".o_field_daterange"),
"o_field_invalid",
"date field should be displayed as invalid"
);
}
);
});