Added default to max users per team (#3602)

3 files changed, 11 insertions, 4 deletions

diff --git a/webapp/components/admin_console/admin_settings.jsx b/webapp/components/admin_console/admin_settings.jsx
index e29be33d1..eda2d1d8a 100644
--- a/webapp/components/admin_console/admin_settings.jsx
+++ b/webapp/components/admin_console/admin_settings.jsx
@@ -85,20 +85,26 @@ export default class AdminSettings extends React.Component {
         );
     }
 
-    parseInt(str) {
+    parseInt(str, defaultValue) {
         const n = parseInt(str, 10);
 
         if (isNaN(n)) {
+            if (defaultValue) {
+                return defaultValue;
+            }
             return 0;
         }
 
         return n;
     }
 
-    parseIntNonZero(str) {
+    parseIntNonZero(str, defaultValue) {
         const n = parseInt(str, 10);
 
         if (isNaN(n) || n < 1) {
+            if (defaultValue) {
+                return defaultValue;
+            }
             return 1;
         }
 
diff --git a/webapp/components/admin_console/password_settings.jsx b/webapp/components/admin_console/password_settings.jsx
index 6eacb6011..20de8580f 100644
--- a/webapp/components/admin_console/password_settings.jsx
+++ b/webapp/components/admin_console/password_settings.jsx
@@ -64,7 +64,7 @@ export default class PasswordSettings extends AdminSettings {
 
     getConfigFromState(config) {
         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.Uppercase = this.refs.uppercase.checked;
             config.PasswordSettings.Number = this.refs.number.checked;
diff --git a/webapp/components/admin_console/users_and_teams_settings.jsx b/webapp/components/admin_console/users_and_teams_settings.jsx
index d330ecd85..b20b66541 100644
--- a/webapp/components/admin_console/users_and_teams_settings.jsx
+++ b/webapp/components/admin_console/users_and_teams_settings.jsx
@@ -4,6 +4,7 @@
 import React from 'react';
 
 import * as Utils from 'utils/utils.jsx';
+import Constants from 'utils/constants.jsx';
 
 import AdminSettings from './admin_settings.jsx';
 import BooleanSetting from './boolean_setting.jsx';
@@ -27,7 +28,7 @@ export default class UsersAndTeamsSettings extends AdminSettings {
     getConfigFromState(config) {
         config.TeamSettings.EnableUserCreation = this.state.enableUserCreation;
         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.RestrictTeamNames = this.state.restrictTeamNames;
         config.TeamSettings.RestrictDirectMessage = this.state.restrictDirectMessage;