summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-07-04 07:04:02 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-07-04 07:04:02 -0400
commit5dfa4fb62979ab9d4eba3c33a29397fe10f7cbc3 (patch)
treee183fbb3bf035f8998143f0e6021aa0eb3409045 /webapp/components
parent0cdc242cfdbc01d2dfb7315534e7ab34a5559beb (diff)
downloadchat-5dfa4fb62979ab9d4eba3c33a29397fe10f7cbc3.tar.gz
chat-5dfa4fb62979ab9d4eba3c33a29397fe10f7cbc3.tar.bz2
chat-5dfa4fb62979ab9d4eba3c33a29397fe10f7cbc3.zip
Adding page size option to LDAP (#3439)
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/admin_console/ldap_settings.jsx21
1 files changed, 21 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