Fixes #26781 - DateTimePicker placement (#6750)

theforeman · May 14, 2019 · 8ee8b40 · 8ee8b40
1 parent c37c7e8
commit 8ee8b40
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/app/views/report_templates/generate.html.erb b/app/views/report_templates/generate.html.erb
@@ -13,7 +13,8 @@
 
   <%= datetime_local_f f, :generate_at,
       label: _('Generate at'),
-      label_help: _('Generate report on a given time.')
+      label_help: _('Generate report on a given time.'),
+      input_props: { placement: 'bottom' }
     %>
 
   <%= checkbox_f f, :send_mail,

diff --git a/webpack/assets/javascripts/react_app/components/common/DateTimePicker/DateTimePicker.js b/webpack/assets/javascripts/react_app/components/common/DateTimePicker/DateTimePicker.js
@@ -52,7 +52,7 @@ class DateTimePicker extends React.Component {
   };
 
   render() {
-    const { locale, weekStartsOn, inputProps, id } = this.props;
+    const { locale, weekStartsOn, inputProps, id, placement } = this.props;
     const { value, typeOfDateInput, isTimeTableOpen, hiddenValue } = this.state;
     const popover = (
       <Popover
@@ -93,7 +93,7 @@ class DateTimePicker extends React.Component {
 
           <OverlayTrigger
             trigger="click"
-            placement="top"
+            placement={placement}
             overlay={popover}
             rootClose
             container={this}
@@ -125,6 +125,7 @@ DateTimePicker.propTypes = {
   inputProps: PropTypes.object,
   id: PropTypes.string,
   hiddenValue: PropTypes.bool,
+  placement: OverlayTrigger.propTypes.placement,
 };
 DateTimePicker.defaultProps = {
   value: new Date(),
@@ -133,5 +134,6 @@ DateTimePicker.defaultProps = {
   inputProps: {},
   id: 'datetime-picker-popover',
   hiddenValue: true,
+  placement: 'top',
 };
 export default DateTimePicker;
diff --git a/...avascripts/react_app/components/common/forms/DateTime/__snapshots__/DateTime.test.js.snap b/...avascripts/react_app/components/common/forms/DateTime/__snapshots__/DateTime.test.js.snap
@@ -19,6 +19,7 @@ exports[`Report Template AutoComplete rendering renders Report Date input 1`] =
       }
     }
     locale="EN"
+    placement="top"
     value="2019-01-04"
     weekStartsOn={1}
   />
@@ -55,6 +56,7 @@ exports[`Report Template AutoComplete rendering renders with Require and Info 1`
       }
     }
     locale="EN"
+    placement="top"
     value="2019-01-04"
     weekStartsOn={1}
   />