From 632370abb5b17ff37e80608865af0c37f7b963ec Mon Sep 17 00:00:00 2001
From: Pat Lathem <patl@codero.com>
Date: Wed, 13 Jan 2016 13:50:05 -0600
Subject: Add channel purpose

---
 web/react/components/channel_info_modal.jsx | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'web/react/components/channel_info_modal.jsx')

diff --git a/web/react/components/channel_info_modal.jsx b/web/react/components/channel_info_modal.jsx
index 18e125de3..bf1c346a0 100644
--- a/web/react/components/channel_info_modal.jsx
+++ b/web/react/components/channel_info_modal.jsx
@@ -10,6 +10,7 @@ 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'
             };
         }
@@ -35,6 +36,10 @@ export default class ChannelInfoModal extends React.Component {
                         <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
-- 
cgit v1.2.3-1-g7c22


From a316cdaa655c1b1ab2046e8b511677661e0bd246 Mon Sep 17 00:00:00 2001
From: Pat Lathem <patl@codero.com>
Date: Wed, 13 Jan 2016 14:06:09 -0600
Subject: Rename 'Channel Handle' to Channel URL'

---
 web/react/components/channel_info_modal.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components/channel_info_modal.jsx')

diff --git a/web/react/components/channel_info_modal.jsx b/web/react/components/channel_info_modal.jsx
index bf1c346a0..109dcb129 100644
--- a/web/react/components/channel_info_modal.jsx
+++ b/web/react/components/channel_info_modal.jsx
@@ -29,7 +29,7 @@ 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-3 info__label'>{'Channel URL:'}</div>
                         <div className='col-sm-9'>{channel.name}</div>
                     </div>
                     <div className='row'>
-- 
cgit v1.2.3-1-g7c22


From 0ac9e9d9a755658740d49de84387bd11b626fba1 Mon Sep 17 00:00:00 2001
From: Pat Lathem <patl@codero.com>
Date: Wed, 13 Jan 2016 14:32:02 -0600
Subject: Show correct channel URL in channel info modal

---
 web/react/components/channel_info_modal.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'web/react/components/channel_info_modal.jsx')

diff --git a/web/react/components/channel_info_modal.jsx b/web/react/components/channel_info_modal.jsx
index 109dcb129..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 {
@@ -15,6 +16,8 @@ export default class ChannelInfoModal extends React.Component {
             };
         }
 
+        const channelURL = Utils.getShortenedTeamURL() + channel.name;
+
         return (
             <Modal
                 show={this.props.show}
@@ -30,7 +33,7 @@ export default class ChannelInfoModal extends React.Component {
                     </div>
                     <div className='row form-group'>
                         <div className='col-sm-3 info__label'>{'Channel URL:'}</div>
-                        <div className='col-sm-9'>{channel.name}</div>
+                        <div className='col-sm-9'>{channelURL}</div>
                     </div>
                     <div className='row'>
                         <div className='col-sm-3 info__label'>{'Channel ID:'}</div>
-- 
cgit v1.2.3-1-g7c22

