diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-08-25 08:51:54 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-25 08:51:54 -0400 |
commit | b40de482a3538d839a8090e9ca8a3b75ac01a877 (patch) | |
tree | dd9e800b87e444acc8de53ca542665156edbcf4f /web/react/pages/channel.jsx | |
parent | fccb967afff39d8b8f57689079387b084723019b (diff) | |
parent | bf82facd5afd6e2c71845f5732654069554c3a16 (diff) | |
download | chat-b40de482a3538d839a8090e9ca8a3b75ac01a877.tar.gz chat-b40de482a3538d839a8090e9ca8a3b75ac01a877.tar.bz2 chat-b40de482a3538d839a8090e9ca8a3b75ac01a877.zip |
Merge pull request #445 from rgarmsen2295/mm-1995
MM-1995 Moved the ability to rename a team into the team settings modal and fixed valet regression
Diffstat (limited to 'web/react/pages/channel.jsx')
-rw-r--r-- | web/react/pages/channel.jsx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx index 0eeb5fb65..98014ed12 100644 --- a/web/react/pages/channel.jsx +++ b/web/react/pages/channel.jsx @@ -14,7 +14,6 @@ var MemberInviteModal = require('../components/invite_member_modal.jsx'); var EditChannelModal = require('../components/edit_channel_modal.jsx'); var DeleteChannelModal = require('../components/delete_channel_modal.jsx'); var RenameChannelModal = require('../components/rename_channel_modal.jsx'); -var RenameTeamModal = require('../components/rename_team_modal.jsx'); var EditPostModal = require('../components/edit_post_modal.jsx'); var DeletePostModal = require('../components/delete_post_modal.jsx'); var MoreChannelsModal = require('../components/more_channels.jsx'); @@ -77,11 +76,6 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann ); React.render( - <RenameTeamModal teamDisplayName={team_name} />, - document.getElementById('rename_team_modal') - ); - - React.render( <GetLinkModal />, document.getElementById('get_link_modal') ); @@ -92,7 +86,7 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann ); React.render( - <TeamSettingsModal />, + <TeamSettingsModal teamDisplayName={team_name} />, document.getElementById('team_settings_modal') ); |