Fix bug for date fields

gocreating · Nov 29, 2016 · b4dd883 · b4dd883
1 parent 40f93de
commit b4dd883
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/common/components/fields/bases/AirDateRange.js b/src/common/components/fields/bases/AirDateRange.js
@@ -1,5 +1,6 @@
 import React, { Component, PropTypes } from 'react';
 import { DateRangePicker } from 'react-dates';
+import moment from 'moment';
 
 let defaultValue = {
   startDate: null,
@@ -37,8 +38,16 @@ class AirDateRange extends Component {
         onDatesChange={this.onDatesChange}
         onFocusChange={this.onFocusChange}
         focusedInput={focusedInput}
-        startDate={input.value.startDate || defaultValue.startDate}
-        endDate={input.value.endDate || defaultValue.endDate}
+        startDate={
+          input.value.startDate ?
+          moment(input.value.startDate) :
+          defaultValue.startDate
+        }
+        endDate={
+          input.value.endDate ?
+          moment(input.value.endDate) :
+          defaultValue.endDate
+        }
       />
     );
   }

diff --git a/src/common/components/fields/bases/AirSingleDate.js b/src/common/components/fields/bases/AirSingleDate.js
@@ -1,5 +1,6 @@
 import React, { Component, PropTypes } from 'react';
 import { SingleDatePicker } from 'react-dates';
+import moment from 'moment';
 
 let defaultValue = null;
 
@@ -33,7 +34,7 @@ class AirSingleDate extends Component {
         {...rest}
         id="date_input"
         focused={focused}
-        date={input.value || defaultValue}
+        date={input.value ? moment(input.value) : defaultValue}
         onDateChange={this.onDateChange}
         onFocusChange={this.onFocusChange}
       />