diff options
| author | George Goldberg <george@gberg.me> | 2017-01-13 13:47:10 +0000 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2017-01-13 10:47:10 -0300 |
| commit | 6c814c72ec8fc5ec5f17c657d2af8fafa67b1e33 (patch) | |
| tree | c32177e218ef0fc62ee771e87cd10bbe12d62050 | |
| parent | 0196137decd24957cb11b3d3875eac54359cada5 (diff) | |
| download | chat-6c814c72ec8fc5ec5f17c657d2af8fafa67b1e33.tar.gz chat-6c814c72ec8fc5ec5f17c657d2af8fafa67b1e33.tar.bz2 chat-6c814c72ec8fc5ec5f17c657d2af8fafa67b1e33.zip | |
PLT-4317: Fix Desktop App platform in sessions list. (#5048)
Incidentally fixes displaying the Linux icon next to sessions on Linux
at the same time.
| -rw-r--r-- | api/user.go | 4 | ||||
| -rw-r--r-- | webapp/components/activity_log_modal.jsx | 11 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/api/user.go b/api/user.go index 760f4faea..966223a5b 100644 --- a/api/user.go +++ b/api/user.go @@ -636,6 +636,10 @@ func doLogin(c *Context, w http.ResponseWriter, r *http.Request, user *model.Use bname = "unknown" } + if strings.Contains(r.UserAgent(), "Mattermost") { + bname = "Desktop App" + } + if bversion == "" { bversion = "0.0" } diff --git a/webapp/components/activity_log_modal.jsx b/webapp/components/activity_log_modal.jsx index b907668f0..0789d8efc 100644 --- a/webapp/components/activity_log_modal.jsx +++ b/webapp/components/activity_log_modal.jsx @@ -134,6 +134,17 @@ export default class ActivityLogModal extends React.Component { } else { devicePicture = 'fa fa-linux'; } + } else if (currentSession.props.os.indexOf('Linux') !== -1) { + devicePicture = 'fa fa-linux'; + } + + if (currentSession.props.browser.indexOf('Desktop App') !== -1) { + devicePlatform = ( + <FormattedMessage + id='activity_log_modal.desktop' + defaultMessage='Native Desktop App' + /> + ); } let moreInfo; diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 72725915f..355720fe0 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -28,6 +28,7 @@ "activity_log.sessionsDescription": "Sessions are created when you log in to a new browser on a device. Sessions let you use Mattermost without having to log in again for a time period specified by the System Admin. If you want to log out sooner, use the 'Logout' button below to end a session.", "activity_log_modal.android": "Android", "activity_log_modal.androidNativeApp": "Android Native App", + "activity_log_modal.desktop": "Native Desktop App", "activity_log_modal.iphoneNativeApp": "iPhone Native App", "add_command.autocomplete": "Autocomplete", "add_command.autocomplete.help": "(Optional) Show slash command in autocomplete list.", |