From 1c7f0be268046d2b509e23268eebcbbef78c5a24 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Thu, 9 Jul 2015 15:49:23 -0400
Subject: Renamed all clientside references from full_name to nickname

---
 web/react/components/member_list_team.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/react/components/member_list_team.jsx')

diff --git a/web/react/components/member_list_team.jsx b/web/react/components/member_list_team.jsx
index 89b5e49d5..8d69a36d3 100644
--- a/web/react/components/member_list_team.jsx
+++ b/web/react/components/member_list_team.jsx
@@ -85,8 +85,8 @@ var MemberListTeamItem = React.createClass({
         return (
             <div className="row member-div">
                 <img className="post-profile-img pull-left" src={"/api/v1/users/" + user.id + "/image?time=" + timestamp} height="36" width="36" />
-                <span className="member-name">{user.full_name.trim() ? user.full_name : user.username}</span>
-                <span className="member-email">{user.full_name.trim() ? user.username : email}</span>
+                <span className="member-name">{user.nickname.trim() ? user.nickname : user.username}</span>
+                <span className="member-email">{user.nickname.trim() ? user.username : email}</span>
                 <div className="dropdown member-drop">
                     <a href="#" className="dropdown-toggle theme" type="button" id="channel_header_dropdown" data-toggle="dropdown" aria-expanded="true">
                         <span>{currentRoles}  </span>
-- 
cgit v1.2.3-1-g7c22


From 098cbcdc21effeebe7e57fbd912a785e85cbfc5d Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Mon, 13 Jul 2015 17:47:57 -0400
Subject: Unify all locations where we determine a user's display named based
 off of their nickname/username into a helper function

---
 web/react/components/member_list_team.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/react/components/member_list_team.jsx')

diff --git a/web/react/components/member_list_team.jsx b/web/react/components/member_list_team.jsx
index 8d69a36d3..6f1d83193 100644
--- a/web/react/components/member_list_team.jsx
+++ b/web/react/components/member_list_team.jsx
@@ -85,8 +85,8 @@ var MemberListTeamItem = React.createClass({
         return (
             <div className="row member-div">
                 <img className="post-profile-img pull-left" src={"/api/v1/users/" + user.id + "/image?time=" + timestamp} height="36" width="36" />
-                <span className="member-name">{user.nickname.trim() ? user.nickname : user.username}</span>
-                <span className="member-email">{user.nickname.trim() ? user.username : email}</span>
+                <span className="member-name">{utils.getDisplayName(user)}</span>
+                <span className="member-email">{email}</span>
                 <div className="dropdown member-drop">
                     <a href="#" className="dropdown-toggle theme" type="button" id="channel_header_dropdown" data-toggle="dropdown" aria-expanded="true">
                         <span>{currentRoles}  </span>
-- 
cgit v1.2.3-1-g7c22