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

exclude time from default date widget format #1143

Merged
merged 2 commits into from
Mar 4, 2018
Merged

exclude time from default date widget format #1143

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc4590
exlude time from default date widget format
erquhart Feb 28, 2018
cc30539
Use formatted datetime value in Redux.
tech4him1 Mar 2, 2018
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
5 changes: 4 additions & 1 deletion src/components/EditorWidgets/Date/DateControl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import PropTypes from 'prop-types';
import DateTime from 'react-datetime';
import moment from 'moment';

const DEFAULT_DATE_FORMAT = 'YYYY-MM-DD';
const DEFAULT_DATETIME_FORMAT = moment.defaultFormat;

export default class DateControl extends React.Component {
static propTypes = {
field: PropTypes.object.isRequired,
Expand Down Expand Up @@ -42,7 +45,7 @@ export default class DateControl extends React.Component {

render() {
const { includeTime, value, classNameWrapper, setActiveStyle, setInactiveStyle } = this.props;
const format = this.format || moment.defaultFormat;
const format = this.format || (includeTime ? DEFAULT_DATETIME_FORMAT : DEFAULT_DATE_FORMAT);
return (
<DateTime
timeFormat={!!includeTime}
Expand Down