IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixing small issue with displaying activity log

Browse Source
This commit is contained in:
=Corey Hulen
2016-01-27 10:07:26 -05:00
parent b7606da40f
commit 41013daa0b
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/react/components/activity_log_modal.jsx
View File

@@ -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' ||

1
web/react/components/error_bar.jsx
View File

@@ -82,6 +82,7 @@ export default class ErrorBar extends React.Component {
e.preventDefault();
}
ErrorStore.clearLastError();
this.setState({message: null});
}

4
web/react/stores/error_store.jsx
View File

@@ -46,6 +46,10 @@ class ErrorStoreClass extends EventEmitter {
storeLastError(error) {
BrowserStore.setItem('last_error', error);
}
clearLastError() {
BrowserStore.removeItem('last_error');
}
}
var ErrorStore = new ErrorStoreClass();