Added default to max users per team (#3602)
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
4e16ea32e3
Коммит
4ecd79f9e6
@@ -85,20 +85,26 @@ export default class AdminSettings extends React.Component {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
parseInt(str) {
|
parseInt(str, defaultValue) {
|
||||||
const n = parseInt(str, 10);
|
const n = parseInt(str, 10);
|
||||||
|
|
||||||
if (isNaN(n)) {
|
if (isNaN(n)) {
|
||||||
|
if (defaultValue) {
|
||||||
|
return defaultValue;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
parseIntNonZero(str) {
|
parseIntNonZero(str, defaultValue) {
|
||||||
const n = parseInt(str, 10);
|
const n = parseInt(str, 10);
|
||||||
|
|
||||||
if (isNaN(n) || n < 1) {
|
if (isNaN(n) || n < 1) {
|
||||||
|
if (defaultValue) {
|
||||||
|
return defaultValue;
|
||||||
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ export default class PasswordSettings extends AdminSettings {
|
|||||||
|
|
||||||
getConfigFromState(config) {
|
getConfigFromState(config) {
|
||||||
if (global.window.mm_license.IsLicensed === 'true' && global.window.mm_license.PasswordRequirements === 'true') {
|
if (global.window.mm_license.IsLicensed === 'true' && global.window.mm_license.PasswordRequirements === 'true') {
|
||||||
config.PasswordSettings.MinimumLength = this.parseIntNonZero(this.state.passwordMinimumLength, 10);
|
config.PasswordSettings.MinimumLength = this.parseIntNonZero(this.state.passwordMinimumLength, Constants.MIN_PASSWORD_LENGTH);
|
||||||
config.PasswordSettings.Lowercase = this.refs.lowercase.checked;
|
config.PasswordSettings.Lowercase = this.refs.lowercase.checked;
|
||||||
config.PasswordSettings.Uppercase = this.refs.uppercase.checked;
|
config.PasswordSettings.Uppercase = this.refs.uppercase.checked;
|
||||||
config.PasswordSettings.Number = this.refs.number.checked;
|
config.PasswordSettings.Number = this.refs.number.checked;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
import * as Utils from 'utils/utils.jsx';
|
import * as Utils from 'utils/utils.jsx';
|
||||||
|
import Constants from 'utils/constants.jsx';
|
||||||
|
|
||||||
import AdminSettings from './admin_settings.jsx';
|
import AdminSettings from './admin_settings.jsx';
|
||||||
import BooleanSetting from './boolean_setting.jsx';
|
import BooleanSetting from './boolean_setting.jsx';
|
||||||
@@ -27,7 +28,7 @@ export default class UsersAndTeamsSettings extends AdminSettings {
|
|||||||
getConfigFromState(config) {
|
getConfigFromState(config) {
|
||||||
config.TeamSettings.EnableUserCreation = this.state.enableUserCreation;
|
config.TeamSettings.EnableUserCreation = this.state.enableUserCreation;
|
||||||
config.TeamSettings.EnableTeamCreation = this.state.enableTeamCreation;
|
config.TeamSettings.EnableTeamCreation = this.state.enableTeamCreation;
|
||||||
config.TeamSettings.MaxUsersPerTeam = this.parseIntNonZero(this.state.maxUsersPerTeam);
|
config.TeamSettings.MaxUsersPerTeam = this.parseIntNonZero(this.state.maxUsersPerTeam, Constants.DEFAULT_MAX_USERS_PER_TEAM);
|
||||||
config.TeamSettings.RestrictCreationToDomains = this.state.restrictCreationToDomains;
|
config.TeamSettings.RestrictCreationToDomains = this.state.restrictCreationToDomains;
|
||||||
config.TeamSettings.RestrictTeamNames = this.state.restrictTeamNames;
|
config.TeamSettings.RestrictTeamNames = this.state.restrictTeamNames;
|
||||||
config.TeamSettings.RestrictDirectMessage = this.state.restrictDirectMessage;
|
config.TeamSettings.RestrictDirectMessage = this.state.restrictDirectMessage;
|
||||||
|
|||||||
@@ -764,6 +764,7 @@ export const Constants = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
OVERLAY_TIME_DELAY: 400,
|
OVERLAY_TIME_DELAY: 400,
|
||||||
|
DEFAULT_MAX_USERS_PER_TEAM: 50,
|
||||||
MIN_TEAMNAME_LENGTH: 4,
|
MIN_TEAMNAME_LENGTH: 4,
|
||||||
MAX_TEAMNAME_LENGTH: 15,
|
MAX_TEAMNAME_LENGTH: 15,
|
||||||
MIN_USERNAME_LENGTH: 3,
|
MIN_USERNAME_LENGTH: 3,
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user