- force a TLS time format for the Time widget #2221

metasfresh · Mar 27, 2019 · c674d19 · c674d19
1 parent fccbb37
commit c674d19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/components/widget/DatePicker.js b/src/components/widget/DatePicker.js
@@ -109,6 +109,8 @@ class DatePicker extends Component {
   );
 
   render() {
+    const format = this.state.open ? true : this.props.timeFormat;
+
     return (
       <div tabIndex="-1" onKeyDown={this.handleKeydown} className="datepicker">
         <TetheredDateTime
@@ -122,6 +124,7 @@ class DatePicker extends Component {
           onFocusInput={this.focusInput}
           closeOnSelect={false}
           {...this.props}
+          timeFormat={format}
         />
         <i className="meta-icon-calendar" key={0} />
       </div>

diff --git a/src/components/widget/RawWidget.js b/src/components/widget/RawWidget.js
@@ -8,7 +8,7 @@ import NumericInput from './NumericQuickInput';
 import { RawWidgetPropTypes, RawWidgetDefaultProps } from './PropTypes';
 import { getClassNames, generateMomentObj } from './RawWidgetHelpers';
 import { allowShortcut, disableShortcut } from '../../actions/WindowActions';
-import { DATE_FORMAT } from '../../constants/Constants';
+import { DATE_FORMAT, DATE_FIELD_FORMATS } from '../../constants/Constants';
 import ActionButton from './ActionButton';
 import Attributes from './Attributes/Attributes';
 import Checkbox from './Checkbox';
@@ -434,7 +434,7 @@ export class RawWidget extends Component {
           <div className={this.getClassNames({ icon: true })}>
             <DatePicker
               field={fields[0].field}
-              timeFormat={true}
+              timeFormat={DATE_FIELD_FORMATS.Time}
               dateFormat={false}
               inputProps={{
                 placeholder: fields[0].emptyText,