summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/admin_console/users_and_teams_settings.jsx2
-rw-r--r--webapp/components/select_team/select_team.jsx13
2 files changed, 14 insertions, 1 deletions
diff --git a/webapp/components/admin_console/users_and_teams_settings.jsx b/webapp/components/admin_console/users_and_teams_settings.jsx
index 15301854f..b2f8afe1b 100644
--- a/webapp/components/admin_console/users_and_teams_settings.jsx
+++ b/webapp/components/admin_console/users_and_teams_settings.jsx
@@ -86,7 +86,7 @@ export default class UsersAndTeamsSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.team.teamCreationDescription'
- defaultMessage='When false, the ability to create teams is disabled. The create team button displays error when pressed.'
+ defaultMessage='When false, only System Administrators can create teams.'
/>
}
value={this.state.enableTeamCreation}
diff --git a/webapp/components/select_team/select_team.jsx b/webapp/components/select_team/select_team.jsx
index 3b1cf829a..cc53b6b8f 100644
--- a/webapp/components/select_team/select_team.jsx
+++ b/webapp/components/select_team/select_team.jsx
@@ -152,6 +152,16 @@ export default class SelectTeam extends React.Component {
var isSystemAdmin = Utils.isSystemAdmin(UserStore.getCurrentUser().roles);
+ let teamHelp = null;
+ if (isSystemAdmin && (global.window.mm_config.EnableTeamCreation === 'false')) {
+ teamHelp = (
+ <FormattedMessage
+ id='login.createTeamAdminOnly'
+ defaultMessage='This option is only available for System Administrators, and does not show up for other users.'
+ />
+ );
+ }
+
let teamSignUp;
if (isSystemAdmin || (global.window.mm_config.EnableTeamCreation === 'true' && !Utils.isMobileApp())) {
teamSignUp = (
@@ -165,6 +175,9 @@ export default class SelectTeam extends React.Component {
defaultMessage='Create a new team'
/>
</Link>
+ <div>
+ {teamHelp}
+ </div>
</div>
);
}