summaryrefslogtreecommitdiffstats
path: root/web/react/pages/channel.jsx
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-08-21 16:36:53 -0700
committerReed Garmsen <rgarmsen2295@gmail.com>2015-08-24 08:36:55 -0700
commitbf82facd5afd6e2c71845f5732654069554c3a16 (patch)
tree14902e0ea04f079b28210d90f423806b8b2c2dea /web/react/pages/channel.jsx
parent3e73ff25d35bf5638aabe70b8596b8c80eb0882b (diff)
downloadchat-bf82facd5afd6e2c71845f5732654069554c3a16.tar.gz
chat-bf82facd5afd6e2c71845f5732654069554c3a16.tar.bz2
chat-bf82facd5afd6e2c71845f5732654069554c3a16.zip
Moved the ability to rename a team into the team settings modal; fixed issues with valet settings
Diffstat (limited to 'web/react/pages/channel.jsx')
-rw-r--r--web/react/pages/channel.jsx8
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')
);