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

1 files changed, 7 insertions, 2 deletions

diff --git a/web/react/components/team_settings_modal.jsx b/web/react/components/team_settings_modal.jsx
index ef2564de0..7e65e8cab 100644
--- a/web/react/components/team_settings_modal.jsx
+++ b/web/react/components/team_settings_modal.jsx
@@ -6,6 +6,9 @@ var TeamSettings = require('./team_settings.jsx');
 
 module.exports = React.createClass({
     displayName: 'Team Settings Modal',
+    propTypes: {
+        teamDisplayName: React.PropTypes.string.isRequired
+    },
     componentDidMount: function() {
         $('body').on('click', '.modal-back', function onClick() {
             $(this).closest('.modal-dialog').removeClass('display--content');
@@ -17,16 +20,17 @@ module.exports = React.createClass({
         });
     },
     updateTab: function(tab) {
-        this.setState({activeTab: tab});
+        this.setState({activeTab: tab, activeSection: ''});
     },
     updateSection: function(section) {
         this.setState({activeSection: section});
     },
     getInitialState: function() {
-        return {activeTab: 'feature', activeSection: ''};
+        return {activeTab: 'general', activeSection: ''};
     },
     render: function() {
         var tabs = [];
+        tabs.push({name: 'general', uiName: 'General', icon: 'glyphicon glyphicon-cog'});
         tabs.push({name: 'import', uiName: 'Import', icon: 'glyphicon glyphicon-upload'});
         tabs.push({name: 'feature', uiName: 'Advanced', icon: 'glyphicon glyphicon-wrench'});
 
@@ -52,6 +56,7 @@ module.exports = React.createClass({
                                 activeTab={this.state.activeTab}
                                 activeSection={this.state.activeSection}
                                 updateSection={this.updateSection}
+                                teamDisplayName={this.props.teamDisplayName}
                             />
                         </div>
                     </div>