diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-12-08 08:14:25 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-12-08 08:14:25 -0500 |
| commit | eb465501f919bf425b9390b9587a84b3651953de (patch) | |
| tree | 34197c671da3d901440d3cd2ad9941297efd5448 /web/react | |
| parent | 2a9fbd7a26f18577d759d5e8e05df82ada1a68ce (diff) | |
| parent | 7d3b3869c9bd38ca666901cacf2cddbaa836107f (diff) | |
| download | chat-eb465501f919bf425b9390b9587a84b3651953de.tar.gz chat-eb465501f919bf425b9390b9587a84b3651953de.tar.bz2 chat-eb465501f919bf425b9390b9587a84b3651953de.zip | |
Merge pull request #1641 from florianorben/display_system_username
Display username 'System' for system messages
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/components/post_header.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/rhs_root_post.jsx | 2 | ||||
| -rw-r--r-- | web/react/utils/constants.jsx | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/web/react/components/post_header.jsx b/web/react/components/post_header.jsx index 76b3a64be..f18024343 100644 --- a/web/react/components/post_header.jsx +++ b/web/react/components/post_header.jsx @@ -34,7 +34,7 @@ export default class PostHeader extends React.Component { userProfile = ( <UserProfile userId={''} - overwriteName={''} + overwriteName={Constants.SYSTEM_MESSAGE_PROFILE_NAME} overwriteImage={Constants.SYSTEM_MESSAGE_PROFILE_IMAGE} disablePopover={true} /> diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx index 8178c5902..dd9a793be 100644 --- a/web/react/components/rhs_root_post.jsx +++ b/web/react/components/rhs_root_post.jsx @@ -167,7 +167,7 @@ export default class RhsRootPost extends React.Component { userProfile = ( <UserProfile userId={''} - overwriteName={''} + overwriteName={Constants.SYSTEM_MESSAGE_PROFILE_NAME} overwriteImage={Constants.SYSTEM_MESSAGE_PROFILE_IMAGE} disablePopover={true} /> diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index 170a16049..b4d56bccb 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -121,6 +121,7 @@ export default { POST_DELETED: 'deleted', POST_TYPE_JOIN_LEAVE: 'system_join_leave', SYSTEM_MESSAGE_PREFIX: 'system_', + SYSTEM_MESSAGE_PROFILE_NAME: 'System', SYSTEM_MESSAGE_PROFILE_IMAGE: '/static/images/logo_compact.png', RESERVED_TEAM_NAMES: [ 'www', |