Merge pull request #950 from mattermost/PLT-519

PLT-519 toggle team creation link based on config setting

utils/config.go

@@ -179,6 +179,8 @@ func getClientProperties(c *model.Config) map[string]string {
 	props["BuildHash"] = model.BuildHash
 
 	props["SiteName"] = c.TeamSettings.SiteName
+	props["EnableTeamCreation"] = strconv.FormatBool(c.TeamSettings.EnableTeamCreation)
+
 	props["EnableOAuthServiceProvider"] = strconv.FormatBool(c.ServiceSettings.EnableOAuthServiceProvider)
 
 	props["SegmentDeveloperKey"] = c.ServiceSettings.SegmentDeveloperKey

web/react/components/navbar_dropdown.jsx

@@ -135,6 +135,7 @@ export default class NavbarDropdown extends React.Component {
 
         var teams = [];
 
+        if (this.state.teams.length > 1) {
             teams.push(
                 <li
                     className='divider'
@@ -143,14 +144,16 @@ export default class NavbarDropdown extends React.Component {
                 </li>
             );
 
-        if (this.state.teams.length > 1) {
             this.state.teams.forEach((teamName) => {
                 if (teamName !== this.props.teamName) {
                     teams.push(<li key={teamName}><a href={Utils.getWindowLocationOrigin() + '/' + teamName}>{'Switch to ' + teamName}</a></li>);
                 }
             });
         }
-        teams.push(<li key='newTeam_li'>
+
+        if (global.window.config.EnableTeamCreation === 'true') {
+            teams.push(
+                <li key='newTeam_li'>
                     <a
                         key='newTeam_a'
                         target='_blank'
@@ -158,7 +161,9 @@ export default class NavbarDropdown extends React.Component {
                     >
                         {'Create a New Team'}
                     </a>
-                    </li>);
+                </li>
+            );
+        }
 
         return (
             <ul className='nav navbar-nav navbar-right'>