diff options
author | =Corey Hulen <corey@hulen.com> | 2016-01-22 16:31:58 -0600 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-01-22 16:31:58 -0600 |
commit | c2d98c2c1f4860c11aedf43aff5e360256a89835 (patch) | |
tree | 4304f7584025477d74e5e70677c4f5a70c26bb58 /web/react/components/channel_info_modal.jsx | |
parent | 6e2c1b7fd5248c6a4a91edcd59fa124c8d3c744a (diff) | |
parent | d352c5b64dddfb8e46b18edbd7352c41495078a1 (diff) | |
download | chat-c2d98c2c1f4860c11aedf43aff5e360256a89835.tar.gz chat-c2d98c2c1f4860c11aedf43aff5e360256a89835.tar.bz2 chat-c2d98c2c1f4860c11aedf43aff5e360256a89835.zip |
merging
Diffstat (limited to 'web/react/components/channel_info_modal.jsx')
-rw-r--r-- | web/react/components/channel_info_modal.jsx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/web/react/components/channel_info_modal.jsx b/web/react/components/channel_info_modal.jsx index 18e125de3..72c7c3daa 100644 --- a/web/react/components/channel_info_modal.jsx +++ b/web/react/components/channel_info_modal.jsx @@ -1,6 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. +import * as Utils from '../utils/utils.jsx'; const Modal = ReactBootstrap.Modal; export default class ChannelInfoModal extends React.Component { @@ -10,10 +11,13 @@ export default class ChannelInfoModal extends React.Component { channel = { display_name: 'No Channel Found', name: 'No Channel Found', + purpose: 'No Channel Found', id: 'No Channel Found' }; } + const channelURL = Utils.getShortenedTeamURL() + channel.name; + return ( <Modal show={this.props.show} @@ -28,13 +32,17 @@ export default class ChannelInfoModal extends React.Component { <div className='col-sm-9'>{channel.display_name}</div> </div> <div className='row form-group'> - <div className='col-sm-3 info__label'>{'Channel Handle:'}</div> - <div className='col-sm-9'>{channel.name}</div> + <div className='col-sm-3 info__label'>{'Channel URL:'}</div> + <div className='col-sm-9'>{channelURL}</div> </div> <div className='row'> <div className='col-sm-3 info__label'>{'Channel ID:'}</div> <div className='col-sm-9'>{channel.id}</div> </div> + <div className='row'> + <div className='col-sm-3 info__label'>{'Channel Purpose:'}</div> + <div className='col-sm-9'>{channel.purpose}</div> + </div> </Modal.Body> <Modal.Footer> <button |