Merge pull request #8718 from alexbrazier/feature/show-user-full-name

[FIX] Show real name of current user at top of side nav if setting enabled
RocketChat · Nov 7, 2017 · 3e9876b · 3e9876b
2 parents dc402b2 + d03816e
commit 3e9876b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/rocketchat-ui-sidenav/client/accountBox.html b/packages/rocketchat-ui-sidenav/client/accountBox.html
@@ -6,7 +6,11 @@
 					{{> avatar username=username}}
 				</div>
 				<div class="sidebar__account-data">
-					<h3 class="sidebar__account-username" data-username="{{username}}">@{{username}}</h3>
+					{{#if fname}}
+						<h3 class="sidebar__account-username" data-username="{{username}}">{{fname}}</h3>
+					{{else}}
+						<h3 class="sidebar__account-username" data-username="{{username}}">@{{username}}</h3>
+					{{/if}}
 					<div class="sidebar__account-status">
 						<div class="sidebar__account-status-bullet sidebar__account-status-bullet--{{bullet}}" title="{{visualStatus}}"></div>
 						<div class="sidebar__account-visual-status">{{visualStatus}}</div>

diff --git a/packages/rocketchat-ui-sidenav/client/accountBox.js b/packages/rocketchat-ui-sidenav/client/accountBox.js
@@ -5,7 +5,7 @@ Template.accountBox.helpers({
 		if (Meteor.user() == null && RocketChat.settings.get('Accounts_AllowAnonymousRead')) {
 			return {
 				name: t('Anonymous'),
-				fname: t('Anonymous'),
+				fname: RocketChat.settings.get('UI_Use_Real_Name') && t('Anonymous'),
 				status: 'online',
 				visualStatus: t('online'),
 				bullet: 'general-success-background',
@@ -24,7 +24,7 @@ Template.accountBox.helpers({
 			bullet: userStatus,
 			_id: Meteor.userId(),
 			username,
-			fname: name || username
+			fname: RocketChat.settings.get('UI_Use_Real_Name') && name
 		};
 	},