From 11247061b5623140656e3ec0ee96b6566637a950 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Wed, 19 Aug 2015 08:31:20 -0400 Subject: Track channel creator in DB and show in channel intro message. --- web/react/components/post_list.jsx | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'web/react/components') diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index bebd6847f..060b8555b 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -377,13 +377,22 @@ module.exports = React.createClass({ } } else if (channel.type === 'P' || channel.type === 'O') { var uiName = channel.display_name; - var members = ChannelStore.getCurrentExtraInfo().members; var creatorName = ''; - for (var i = 0; i < members.length; i++) { - if (members[i].roles.indexOf('admin') > -1) { - creatorName = members[i].username; - break; + if (channel.creator_id.length > 0) { + var creator = UserStore.getProfile(channel.creator_id); + if (creator) { + creatorName = creator.username; + } + } + + if (creatorName === '') { + var members = ChannelStore.getCurrentExtraInfo().members; + for (var i = 0; i < members.length; i++) { + if (members[i].roles.indexOf('admin') > -1) { + creatorName = members[i].username; + break; + } } } -- cgit v1.2.3-1-g7c22