diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-07-04 07:04:02 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-07-04 07:04:02 -0400 |
| commit | 5dfa4fb62979ab9d4eba3c33a29397fe10f7cbc3 (patch) | |
| tree | e183fbb3bf035f8998143f0e6021aa0eb3409045 /webapp | |
| parent | 0cdc242cfdbc01d2dfb7315534e7ab34a5559beb (diff) | |
| download | chat-5dfa4fb62979ab9d4eba3c33a29397fe10f7cbc3.tar.gz chat-5dfa4fb62979ab9d4eba3c33a29397fe10f7cbc3.tar.bz2 chat-5dfa4fb62979ab9d4eba3c33a29397fe10f7cbc3.zip | |
Adding page size option to LDAP (#3439)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/ldap_settings.jsx | 21 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 3 |
2 files changed, 24 insertions, 0 deletions
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx index d362f1020..53b3d23e6 100644 --- a/webapp/components/admin_console/ldap_settings.jsx +++ b/webapp/components/admin_console/ldap_settings.jsx @@ -38,6 +38,7 @@ export default class LdapSettings extends AdminSettings { syncIntervalMinutes: props.config.LdapSettings.SyncIntervalMinutes, skipCertificateVerification: props.config.LdapSettings.SkipCertificateVerification, queryTimeout: props.config.LdapSettings.QueryTimeout, + maxPageSize: props.config.LdapSettings.MaxPageSize, loginFieldName: props.config.LdapSettings.LoginFieldName }); } @@ -60,6 +61,7 @@ export default class LdapSettings extends AdminSettings { config.LdapSettings.SyncIntervalMinutes = this.parseIntNonZero(this.state.syncIntervalMinutes); config.LdapSettings.SkipCertificateVerification = this.state.skipCertificateVerification; config.LdapSettings.QueryTimeout = this.parseIntNonZero(this.state.queryTimeout); + config.LdapSettings.MaxPageSize = this.parseInt(this.state.maxPageSize); config.LdapSettings.LoginFieldName = this.state.loginFieldName; return config; @@ -387,6 +389,25 @@ export default class LdapSettings extends AdminSettings { disabled={!this.state.enable} /> <TextSetting + id='maxPageSize' + label={ + <FormattedMessage + id='admin.ldap.maxPageSizeTitle' + defaultMessage='Maximum Page Size' + /> + } + placeholder={Utils.localizeMessage('admin.ldap.maxPageSizeEx', 'Ex "2000"')} + helpText={ + <FormattedMessage + id='admin.ldap.maxPageSizeHelpText' + defaultMessage='The maximum number of users the Mattermost server will request from the LDAP server at one time. 0 is unlimited.' + /> + } + value={this.state.maxPageSize} + onChange={this.handleChange} + disabled={!this.state.enable} + /> + <TextSetting id='loginFieldName' label={ <FormattedMessage diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 92f5b6dea..136bafcd3 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -317,6 +317,9 @@ "admin.ldap.queryDesc": "The timeout value for queries to the LDAP server. Increase if you are getting timeout errors caused by a slow LDAP server.", "admin.ldap.queryEx": "Ex \"60\"", "admin.ldap.queryTitle": "Query Timeout (seconds):", + "admin.ldap.maxPageSizeTitle": "Maximum Page Size", + "admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the LDAP server at one time. 0 is unlimited.", + "admin.ldap.maxPageSizeEx": "Ex \"2000\"", "admin.ldap.serverDesc": "The domain or IP address of LDAP server.", "admin.ldap.serverEx": "Ex \"10.0.0.23\"", "admin.ldap.serverTitle": "LDAP Server:", |