From 9101c01549e7dc1677352dd3512b2b0ca7a4e252 Mon Sep 17 00:00:00 2001 From: Brent Hoover Date: Tue, 18 Apr 2017 09:57:11 +0800 Subject: [PATCH 1/2] Fix missing import --- imports/plugins/core/email/client/components/emailTableColumn.js | 1 + 1 file changed, 1 insertion(+) diff --git a/imports/plugins/core/email/client/components/emailTableColumn.js b/imports/plugins/core/email/client/components/emailTableColumn.js index 6e40ec37f95..2aef863dd64 100644 --- a/imports/plugins/core/email/client/components/emailTableColumn.js +++ b/imports/plugins/core/email/client/components/emailTableColumn.js @@ -1,6 +1,7 @@ import React, { Component, PropTypes } from "react"; import moment from "moment"; import { Icon } from "/imports/plugins/core/ui/client/components"; +import { i18next } from "/client/api"; class EmailTableColumn extends Component { static propTypes = { From c7c51f6992f0fc4d224ceb9992e8317c1dc084a3 Mon Sep 17 00:00:00 2001 From: Brent Hoover Date: Tue, 18 Apr 2017 10:31:54 +0800 Subject: [PATCH 2/2] Add import, adjust Proptypes --- .../plugins/core/email/client/components/emailTableColumn.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/imports/plugins/core/email/client/components/emailTableColumn.js b/imports/plugins/core/email/client/components/emailTableColumn.js index 2aef863dd64..fe8decab88c 100644 --- a/imports/plugins/core/email/client/components/emailTableColumn.js +++ b/imports/plugins/core/email/client/components/emailTableColumn.js @@ -5,7 +5,10 @@ import { i18next } from "/client/api"; class EmailTableColumn extends Component { static propTypes = { - data: PropTypes.object, + data: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.instanceOf(Date) + ]), metadata: PropTypes.object, rowData: PropTypes.object }