summaryrefslogtreecommitdiffstats
path: root/web/react/components/sidebar_header.jsx
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-07-22 10:43:16 -0800
committerCorey Hulen <corey@hulen.com>2015-07-22 10:43:16 -0800
commit3fca3b93f5bed0f695c098b6c7d751e279b31a34 (patch)
tree3b67b1361ca425fcf43b04e7cbd42c4bd548d83c /web/react/components/sidebar_header.jsx
parent36d0e7c8d3bb91bfd2b19be43503aaecc72a392e (diff)
parent06c278328afdb9b8c7bcc5590ebdeb330b93f431 (diff)
downloadchat-3fca3b93f5bed0f695c098b6c7d751e279b31a34.tar.gz
chat-3fca3b93f5bed0f695c098b6c7d751e279b31a34.tar.bz2
chat-3fca3b93f5bed0f695c098b6c7d751e279b31a34.zip
Merge pull request #234 from asaadmahmoodspin/master
Profile pic changes in LHS Header
Diffstat (limited to 'web/react/components/sidebar_header.jsx')
-rw-r--r--web/react/components/sidebar_header.jsx4
1 files changed, 4 insertions, 0 deletions
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index bab2897b6..7a7e92854 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -115,7 +115,11 @@ module.exports = React.createClass({
return (
<div className="team__header theme">
<a className="settings_link" href="#" data-toggle="modal" data-target="#user_settings1">
+ { me.last_picture_update ?
<img className="user__picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} />
+ :
+ <div />
+ }
<div className="header__info">
<div className="user__name">{ '@' + me.username}</div>
<div className="team__name">{ teamDisplayName }</div>