diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-08-19 14:15:01 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-08-19 14:15:01 -0400 |
commit | 65f1d0297e2d8221de5e00bc8ec28c965395b598 (patch) | |
tree | 6a231685d858d3580372ef657ba36a6b8f1107ff /web | |
parent | fbc2283220240b564eec1a0a0a037443a78f8036 (diff) | |
parent | 11247061b5623140656e3ec0ee96b6566637a950 (diff) | |
download | chat-65f1d0297e2d8221de5e00bc8ec28c965395b598.tar.gz chat-65f1d0297e2d8221de5e00bc8ec28c965395b598.tar.bz2 chat-65f1d0297e2d8221de5e00bc8ec28c965395b598.zip |
Merge pull request #406 from mattermost/mm-1281
MM-1281 Track channel creator in DB and show in channel intro message
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/post_list.jsx | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index 5fbee99f6..8b60f0251 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -392,13 +392,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; + } } } |