HW 4139: Make channel limits configurable in the System Console (#4154)
* Auto Changes * 4139 Made channel limits configurable in the System Console as described in the issue * Removed error message entries from other locales, made maxChannelsPerteam type to pointer * Added * symbol to maxChannelsPerTeam inside isValid function * Update team_test.go * Restored to old test * Checked maximum number channels per team when creating channel * Fixed code to pass api/channel_test.go * Reverted changes on config except MaxChannelsPerTeam * Update channel.go * Ran gofmt -w . * Reverted vendor directoy
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
d13ba8c55c
Коммит
234958e007
@@ -32,6 +32,7 @@ export default class UsersAndTeamsSettings extends AdminSettings {
|
||||
config.TeamSettings.RestrictCreationToDomains = this.state.restrictCreationToDomains;
|
||||
config.TeamSettings.RestrictTeamNames = this.state.restrictTeamNames;
|
||||
config.TeamSettings.RestrictDirectMessage = this.state.restrictDirectMessage;
|
||||
config.TeamSettings.MaxChannelsPerTeam = this.parseIntNonZero(this.state.maxChannelsPerTeam, Constants.DEFAULT_MAX_CHANNELS_PER_TEAM);
|
||||
|
||||
return config;
|
||||
}
|
||||
@@ -43,7 +44,8 @@ export default class UsersAndTeamsSettings extends AdminSettings {
|
||||
maxUsersPerTeam: config.TeamSettings.MaxUsersPerTeam,
|
||||
restrictCreationToDomains: config.TeamSettings.RestrictCreationToDomains,
|
||||
restrictTeamNames: config.TeamSettings.RestrictTeamNames,
|
||||
restrictDirectMessage: config.TeamSettings.RestrictDirectMessage
|
||||
restrictDirectMessage: config.TeamSettings.RestrictDirectMessage,
|
||||
maxChannelsPerTeam: config.TeamSettings.MaxChannelsPerTeam
|
||||
};
|
||||
}
|
||||
|
||||
@@ -113,6 +115,24 @@ export default class UsersAndTeamsSettings extends AdminSettings {
|
||||
value={this.state.maxUsersPerTeam}
|
||||
onChange={this.handleChange}
|
||||
/>
|
||||
<TextSetting
|
||||
id='maxChannelsPerTeam'
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='admin.team.maxChannelsTitle'
|
||||
defaultMessage='Max Channels Per Team:'
|
||||
/>
|
||||
}
|
||||
placeholder={Utils.localizeMessage('admin.team.maxChannelsExample', 'Ex "100"')}
|
||||
helpText={
|
||||
<FormattedMessage
|
||||
id='admin.team.maxChannelsDescription'
|
||||
defaultMessage='Maximum total number of channels per team, including both active and deleted channels.'
|
||||
/>
|
||||
}
|
||||
value={this.state.maxChannelsPerTeam}
|
||||
onChange={this.handleChange}
|
||||
/>
|
||||
<TextSetting
|
||||
id='restrictCreationToDomains'
|
||||
label={
|
||||
|
||||
@@ -780,6 +780,9 @@
|
||||
"admin.team.maxUsersDescription": "Maximum total number of users per team, including both active and inactive users.",
|
||||
"admin.team.maxUsersExample": "E.g.: \"25\"",
|
||||
"admin.team.maxUsersTitle": "Max Users Per Team:",
|
||||
"admin.team.maxChannelsDescription": "Maximum total number of channels per team, including both active and deleted channels.",
|
||||
"admin.team.maxChannelsExample": "Ex \"100\"",
|
||||
"admin.team.maxChannelsTitle": "Max Channels Per Team:",
|
||||
"admin.team.noBrandImage": "No brand image uploaded",
|
||||
"admin.team.openServerDescription": "When true, anyone can signup for a user account on this server without the need to be invited.",
|
||||
"admin.team.openServerTitle": "Enable Open Server: ",
|
||||
|
||||
@@ -818,6 +818,7 @@ export const Constants = {
|
||||
WEBRTC_TIME_DELAY: 750,
|
||||
WEBRTC_CLEAR_ERROR_DELAY: 15000,
|
||||
DEFAULT_MAX_USERS_PER_TEAM: 50,
|
||||
DEFAULT_MAX_CHANNELS_PER_TEAM: 2000,
|
||||
MIN_TEAMNAME_LENGTH: 4,
|
||||
MAX_TEAMNAME_LENGTH: 15,
|
||||
MIN_USERNAME_LENGTH: 3,
|
||||
|
||||
Ссылка в новой задаче
Block a user