summaryrefslogtreecommitdiffstats
path: root/web/react/components/post_right.jsx
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-07-19 20:31:37 -0700
committerReed Garmsen <rgarmsen2295@gmail.com>2015-07-19 20:31:37 -0700
commit12c19e3390fa501b25b1b746ddc3f48e525d7fff (patch)
tree903a43ab748e229e5a1bc6b71ed25ad3e1bf2ad2 /web/react/components/post_right.jsx
parent876ad10f6f14579336a89c36b4937311326149d4 (diff)
downloadchat-12c19e3390fa501b25b1b746ddc3f48e525d7fff.tar.gz
chat-12c19e3390fa501b25b1b746ddc3f48e525d7fff.tar.bz2
chat-12c19e3390fa501b25b1b746ddc3f48e525d7fff.zip
Added channel name to RHS comment threads; minor css changes to compensate for addition
Diffstat (limited to 'web/react/components/post_right.jsx')
-rw-r--r--web/react/components/post_right.jsx6
1 files changed, 6 insertions, 0 deletions
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index cc6751738..9ec9d8eaf 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -68,6 +68,7 @@ RootPost = React.createClass({
var filenames = this.props.post.filenames;
var isOwner = UserStore.getCurrentId() == this.props.post.user_id;
var timestamp = UserStore.getProfile(this.props.post.user_id).update_at;
+ var channel = ChannelStore.get(this.props.post.channel_id);
var type = "Post";
if (this.props.post.root_id.length > 0) {
@@ -79,6 +80,10 @@ RootPost = React.createClass({
currentUserCss = "current--user";
}
+ if (channel) {
+ channelName = (channel.type === 'D') ? "Private Message" : channel.display_name;
+ }
+
if (filenames) {
var postFiles = [];
var images = [];
@@ -118,6 +123,7 @@ RootPost = React.createClass({
return (
<div className={"post post--root " + currentUserCss}>
+ <div className="post-right-channel__name">{ channelName }</div>
<div className="post-profile-img__container">
<img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image?time=" + timestamp} height="36" width="36" />
</div>