diff options
author | fengpan <pan.feng@shareworks.cn> | 2017-02-17 21:58:39 +0800 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-02-17 08:58:39 -0500 |
commit | b3afe9fb16523415f3bceafde9bb80b4d229e2b2 (patch) | |
tree | 5504e89a018af64c0262e011fced23d848aabaca /webapp/components/change_url_modal.jsx | |
parent | 26e44d9b32948693a035bea5cb31134526e01fe3 (diff) | |
download | chat-b3afe9fb16523415f3bceafde9bb80b4d229e2b2.tar.gz chat-b3afe9fb16523415f3bceafde9bb80b4d229e2b2.tar.bz2 chat-b3afe9fb16523415f3bceafde9bb80b4d229e2b2.zip |
Rename channel (#5322)
* fix react proptypes
* Replace the handle field and label with url
* Update rename channel url correctly
* fix merge
* fix after test-1
* update i18n
Diffstat (limited to 'webapp/components/change_url_modal.jsx')
-rw-r--r-- | webapp/components/change_url_modal.jsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/change_url_modal.jsx b/webapp/components/change_url_modal.jsx index 4abc469ea..009a9b798 100644 --- a/webapp/components/change_url_modal.jsx +++ b/webapp/components/change_url_modal.jsx @@ -135,10 +135,10 @@ export default class ChangeUrlModal extends React.Component { ); } - const fullTeamUrl = TeamStore.getCurrentTeamUrl(); - const teamURL = URL.getShortenedTeamURL(TeamStore.getCurrentTeamUrl()); + const fullUrl = TeamStore.getCurrentTeamUrl() + '/channels'; + const shortURL = URL.getShortenedURL(fullUrl); const urlTooltip = ( - <Tooltip id='urlTooltip'>{fullTeamUrl}</Tooltip> + <Tooltip id='urlTooltip'>{fullUrl}</Tooltip> ); return ( @@ -165,7 +165,7 @@ export default class ChangeUrlModal extends React.Component { placement='top' overlay={urlTooltip} > - <span className='input-group-addon'>{teamURL}</span> + <span className='input-group-addon'>{shortURL}</span> </OverlayTrigger> <input type='text' |