Merge pull request #9866 from sumedh123/sidebar-userstatus

[FIX] User status missing on user info
RocketChat · Mar 26, 2018 · ee574bb · ee574bb
2 parents 0128874 + 2b231cd
commit ee574bb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userInfo.html b/packages/rocketchat-ui-flextab/client/tabs/userInfo.html
@@ -25,6 +25,10 @@ <h1 class="contextual-bar__header-title">{{_ "User_Info"}}</h1>
 						</div>
 						<h3 title="{{name}}" class="rc-user-info__name"><i class="status-{{status}}"></i> {{name}}</h3>
 						{{#if username}}<p class="rc-user-info__username">@{{username}}</p>{{/if}}
+						<span class="rc-header__status">
+							<div class="rc-header__status-bullet rc-header__status-bullet--{{userStatus}}" title="{{userStatus}}"></div>
+							<div class="rc-header__visual-status">{{userStatus}}</div>
+						</span>
 					</div>
 
 					<div class="rc-user-info-action">

diff --git a/packages/rocketchat-ui-flextab/client/tabs/userInfo.js b/packages/rocketchat-ui-flextab/client/tabs/userInfo.js
@@ -62,6 +62,12 @@ Template.userInfo.helpers({
 		return user && user.username;
 	},
 
+	userStatus() {
+		const user = Template.instance().user.get();
+		const userStatus = Session.get(`user_${ user.username }_status`);
+		return userStatus;
+	},
+
 	email() {
 		const user = Template.instance().user.get();
 		return user && user.emails && user.emails[0] && user.emails[0].address;