diff options
| author | Corey Hulen <corey@hulen.com> | 2016-03-17 13:16:10 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-03-17 13:16:10 -0700 |
| commit | 53d7718e57d4225eb5c020324d32cbe5b5eca7ad (patch) | |
| tree | 9e549812c250513d56dd631c65c49402ea549ff7 /webapp/components/audit_table.jsx | |
| parent | 8d571ee498c97128bd797f8ac1cb4c3c995fb875 (diff) | |
| parent | 2e5cc29738340c7330d1b2606ceba40865872e4c (diff) | |
| download | chat-53d7718e57d4225eb5c020324d32cbe5b5eca7ad.tar.gz chat-53d7718e57d4225eb5c020324d32cbe5b5eca7ad.tar.bz2 chat-53d7718e57d4225eb5c020324d32cbe5b5eca7ad.zip | |
Merge pull request #2442 from mattermost/PLT-2115
PLT-2115 adding compliance feature
Diffstat (limited to 'webapp/components/audit_table.jsx')
| -rw-r--r-- | webapp/components/audit_table.jsx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/webapp/components/audit_table.jsx b/webapp/components/audit_table.jsx index 73dcfccc3..abf09dfaf 100644 --- a/webapp/components/audit_table.jsx +++ b/webapp/components/audit_table.jsx @@ -219,7 +219,12 @@ class AuditTable extends React.Component { let uContent; if (this.props.showUserId) { - uContent = <td>{auditInfo.userId}</td>; + var profile = UserStore.getProfile(auditInfo.userId); + if (profile) { + uContent = <td>{profile.email}</td>; + } else { + uContent = <td>{auditInfo.userId}</td>; + } } let iContent; @@ -562,6 +567,8 @@ export function formatAuditInfo(audit, formatMessage) { default: break; } + } else if (actionURL.indexOf('/admin/download_compliance_report') === 0) { + auditDesc = Utils.toTitleCase(audit.extra_info); } else { switch (actionURL) { case '/logout': |