From 7d3b3869c9bd38ca666901cacf2cddbaa836107f Mon Sep 17 00:00:00 2001
From: Florian Orben <florian.orben@gmail.com>
Date: Mon, 7 Dec 2015 18:37:21 +0100
Subject: Display username 'System' for system messages

---
 web/react/components/post_header.jsx    | 2 +-
 web/react/components/rhs_root_post.jsx  | 2 +-
 web/react/utils/constants.jsx           | 1 +
 web/sass-files/sass/partials/_post.scss | 4 ----
 4 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'web')

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 0a37a6803..46c9c3b66 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',
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 3b7184550..b1a16694a 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -373,10 +373,6 @@ body.ios {
         background-color: beige;
     }
 
-	&.post--system .post__header .col__name {
-		display: none;
-	}
-
 	ul {
 		margin: 0;
 		padding: 0;
-- 
cgit v1.2.3-1-g7c22