From d7cdcf082fab6c0cb7c2fe4bed821bd1a8000e69 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Mon, 8 Feb 2016 07:26:10 -0500 Subject: Convering client to react-router. --- web/react/components/audit_table.jsx | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'web/react/components/audit_table.jsx') diff --git a/web/react/components/audit_table.jsx b/web/react/components/audit_table.jsx index 47eee6d3f..917093840 100644 --- a/web/react/components/audit_table.jsx +++ b/web/react/components/audit_table.jsx @@ -5,7 +5,7 @@ import UserStore from '../stores/user_store.jsx'; import ChannelStore from '../stores/channel_store.jsx'; import * as Utils from '../utils/utils.jsx'; -import {intlShape, injectIntl, defineMessages, FormattedMessage} from 'mm-intl'; +import {intlShape, injectIntl, defineMessages, FormattedMessage, FormattedDate, FormattedTime} from 'mm-intl'; const holders = defineMessages({ sessionRevoked: { @@ -598,8 +598,23 @@ export function formatAuditInfo(audit, formatMessage) { } const date = new Date(audit.create_at); - let auditInfo = {}; - auditInfo.timestamp = date.toLocaleDateString(global.window.mm_locale, {month: 'short', day: '2-digit', year: 'numeric'}) + ' - ' + date.toLocaleTimeString(global.window.mm_locale, {hour: '2-digit', minute: '2-digit'}); + const auditInfo = {}; + auditInfo.timestamp = ( +
+ + {' - '} + +
+ ); auditInfo.userId = audit.user_id; auditInfo.desc = auditDesc; auditInfo.ip = audit.ip_address; -- cgit v1.2.3-1-g7c22