Skip to content

7993/fix end event date required with open end option checked #7995

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

Open
TimoBroeskamp wants to merge 4 commits into
base: main
Choose a base branch
from
Open

7993/fix end event date required with open end option checked #7995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35b0681
Fixed the need for the end date to be set even when open end is checked
TimoBroeskamp Mar 12, 2026
4a2d076
reverted one unnecessary change
TimoBroeskamp Mar 12, 2026
0b94430
added changelog
TimoBroeskamp Mar 12, 2026
61305f7
When checking open_end formData.end is now set to formData.start and …
TimoBroeskamp Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/volto/news/7993.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed the requirement to set the end date when "open end" is checked. @TimoBroeskamp
4 changes: 4 additions & 0 deletions packages/volto/src/components/manage/Widgets/DatetimeWidget.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ const DatetimeWidgetComponent = (props) => {
if (id === 'end' && formData?.open_end) {
return null;
}
// If open_end is checked set formData.end to formData.start
if (formData?.open_end === true) {
formData.end = formData.start;
Copy link
Copy Markdown
Member

@gyst gyst Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This deviates from the backend default, which is to set end to one hour after start.

https://github.com/plone/plone.app.event/blob/ffc29bbfe8a7461da0b72b8b7af844a2871be7b2/src/plone/app/event/dx/behaviors.py#L97

https://github.com/plone/plone.app.event/blob/ffc29bbfe8a7461da0b72b8b7af844a2871be7b2/src/plone/app/event/base.py#L37

https://github.com/plone/plone.app.event/blob/ffc29bbfe8a7461da0b72b8b7af844a2871be7b2/src/plone/app/event/base.py#L914

}

const getInternalValue = () => {
return parseDateTime(toBackendLang(lang), value, undefined, moment.default);
Expand Down
6 changes: 4 additions & 2 deletions packages/volto/src/helpers/FormValidation/validators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ export const startEventDateRangeValidator = ({
formatMessage,
}: Validator) => {
const isValid =
value && formData.end && new Date(value) < new Date(formData.end);
(value && formData.end && new Date(value) < new Date(formData.end)) ||
(formData.open_end && formData.start === formData.end);
Copy link
Copy Markdown
Member

@gyst gyst Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks with the backend defaults, see above. Better is to require that start <= end in case of open_end.

return !isValid
? formatMessage(messages.startEventRange, {
endDateValueOrEndFieldName: formData.end || 'end',
Expand All @@ -175,7 +176,8 @@ export const endEventDateRangeValidator = ({
formatMessage,
}: Validator) => {
const isValid =
value && formData.start && new Date(value) > new Date(formData.start);
(value && formData.start && new Date(value) > new Date(formData.start)) ||
(formData.open_end && formData.start === formData.end);
Copy link
Copy Markdown
Member

@gyst gyst Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

return !isValid
? formatMessage(messages.endEventRange, {
startDateValueOrStartFieldName: formData.start || 'start',
Expand Down
Loading