Merge pull request #211 from rgarmsen2295/mm-1186

MM-1186 Adds channel name to RHS comment threads

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>

web/react/components/search_results.jsx

@@ -77,7 +77,7 @@ var SearchItem = React.createClass({
 
         var message = utils.textToJsx(this.props.post.message, {searchTerm: this.props.term, noMentionHighlight: !this.props.isMentionSearch});
         var channelName = "";
-        var channel = ChannelStore.get(this.props.post.channel_id)
+        var channel = ChannelStore.get(this.props.post.channel_id);
         var timestamp = UserStore.getCurrentUser().update_at;
 
         if (channel) {