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/components/team_settings.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/components/team_settings.jsx')
-rw-r--r-- | web/react/components/team_settings.jsx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/web/react/components/team_settings.jsx b/web/react/components/team_settings.jsx index 94d536651..1a79eef1d 100644 --- a/web/react/components/team_settings.jsx +++ b/web/react/components/team_settings.jsx @@ -4,6 +4,7 @@ var TeamStore = require('../stores/team_store.jsx'); var ImportTab = require('./team_import_tab.jsx'); var FeatureTab = require('./team_feature_tab.jsx'); +var GeneralTab = require('./team_general_tab.jsx'); var utils = require('../utils/utils.jsx'); module.exports = React.createClass({ @@ -11,7 +12,8 @@ module.exports = React.createClass({ propTypes: { activeTab: React.PropTypes.string.isRequired, activeSection: React.PropTypes.string.isRequired, - updateSection: React.PropTypes.func.isRequired + updateSection: React.PropTypes.func.isRequired, + teamDisplayName: React.PropTypes.string.isRequired }, componentDidMount: function() { TeamStore.addChangeListener(this.onChange); @@ -34,6 +36,12 @@ module.exports = React.createClass({ case 'general': result = ( <div> + <GeneralTab + team={this.state.team} + activeSection={this.props.activeSection} + updateSection={this.props.updateSection} + teamDisplayName={this.props.teamDisplayName} + /> </div> ); break; |