summaryrefslogtreecommitdiffstats
path: root/web/react/components/sidebar_header.jsx
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-07-22 19:19:27 -0800
committerCorey Hulen <corey@hulen.com>2015-07-22 19:19:27 -0800
commitdc79707787b521ea5fc0d9088ccd9069780c8e0c (patch)
tree2f37a2aa6aa897fac5c5045d513eb1a69c818f6e /web/react/components/sidebar_header.jsx
parent37c8193dceb37dc6bd2d38b50fdbe0b4647bff2f (diff)
parent8476062d214230e2370af87a9495457c7a5a2a6d (diff)
downloadchat-dc79707787b521ea5fc0d9088ccd9069780c8e0c.tar.gz
chat-dc79707787b521ea5fc0d9088ccd9069780c8e0c.tar.bz2
chat-dc79707787b521ea5fc0d9088ccd9069780c8e0c.zip
Merge pull request #194 from ralder/fix-command-box-css
[webui] fix command-list css
Diffstat (limited to 'web/react/components/sidebar_header.jsx')
-rw-r--r--web/react/components/sidebar_header.jsx10
1 files changed, 5 insertions, 5 deletions
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index 7a7e92854..859e425a6 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -101,13 +101,13 @@ module.exports = React.createClass({
getDefaultProps: function() {
return {
- teamName: config.SiteName
+ teamDisplayName: config.SiteName
};
},
render: function() {
- var teamDisplayName = this.props.teamDisplayName ? this.props.teamDisplayName : config.SiteName;
- var me = UserStore.getCurrentUser()
+ var me = UserStore.getCurrentUser();
+
if (!me) {
return null;
}
@@ -118,11 +118,11 @@ module.exports = React.createClass({
{ me.last_picture_update ?
<img className="user__picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} />
:
- <div />
+ null
}
<div className="header__info">
<div className="user__name">{ '@' + me.username}</div>
- <div className="team__name">{ teamDisplayName }</div>
+ <div className="team__name">{ this.props.teamDisplayName }</div>
</div>
</a>
<NavbarDropdown teamType={this.props.teamType} />