diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-01-27 10:43:24 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-01-27 10:43:24 -0500 |
commit | d2a1950d3c9f074b9b846b471968728a98dd44cf (patch) | |
tree | 7339eecd1686c698ef80a1efa4e16f158be6efc4 /web/react/components | |
parent | 8868c465c0ac163be266bc976848afbce141f5e5 (diff) | |
parent | 41013daa0b86a450ade9cdac911ccdb7722eb473 (diff) | |
download | chat-d2a1950d3c9f074b9b846b471968728a98dd44cf.tar.gz chat-d2a1950d3c9f074b9b846b471968728a98dd44cf.tar.bz2 chat-d2a1950d3c9f074b9b846b471968728a98dd44cf.zip |
Merge pull request #1995 from mattermost/PLT-1586b
Fixing small issue with displaying activity log
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/activity_log_modal.jsx | 4 | ||||
-rw-r--r-- | web/react/components/error_bar.jsx | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx index eec4d8f8d..2c42f5971 100644 --- a/web/react/components/activity_log_modal.jsx +++ b/web/react/components/activity_log_modal.jsx @@ -100,10 +100,10 @@ export default class ActivityLogModal extends React.Component { if (currentSession.props.platform === 'Windows') { devicePicture = 'fa fa-windows'; - } else if (currentSession.device_id.indexOf('apple:') === 0) { + } else if (currentSession.device_id && currentSession.device_id.indexOf('apple:') === 0) { devicePicture = 'fa fa-apple'; devicePlatform = 'iPhone Native App'; - } else if (currentSession.device_id.indexOf('android:') === 0) { + } else if (currentSession.device_id && currentSession.device_id.indexOf('android:') === 0) { devicePlatform = 'Android Native App'; devicePicture = 'fa fa-android'; } else if (currentSession.props.platform === 'Macintosh' || diff --git a/web/react/components/error_bar.jsx b/web/react/components/error_bar.jsx index e9aa8197c..f04185b46 100644 --- a/web/react/components/error_bar.jsx +++ b/web/react/components/error_bar.jsx @@ -87,6 +87,7 @@ export default class ErrorBar extends React.Component { e.preventDefault(); } + ErrorStore.clearLastError(); this.setState({message: null}); } |