Use Constants.MAX_CHANNELNAME_LENGTH where a fixed number like 22 or 64 is used for max length of channel names. (#7041)

Этот коммит содержится в:
David Meza
2017-08-01 07:12:25 -05:00
коммит произвёл George Goldberg
родитель 00e8b6621a
Коммит b023b89155
4 изменённых файлов: 11 добавлений и 9 удалений

Просмотреть файл

@@ -191,7 +191,7 @@ export default class ChangeUrlModal extends React.Component {
type='text' type='text'
ref='urlinput' ref='urlinput'
className='form-control' className='form-control'
maxLength='22' maxLength={Constants.MAX_CHANNELNAME_LENGTH}
onChange={this.onURLChanged} onChange={this.onURLChanged}
value={this.state.currentURL} value={this.state.currentURL}
autoFocus={true} autoFocus={true}

Просмотреть файл

@@ -21,7 +21,7 @@ const holders = defineMessages({
}, },
maxLength: { maxLength: {
id: 'rename_channel.maxLength', id: 'rename_channel.maxLength',
defaultMessage: 'This field must be less than 22 characters' defaultMessage: 'This field must be less than {maxLength, number} characters'
}, },
lowercase: { lowercase: {
id: 'rename_channel.lowercase', id: 'rename_channel.lowercase',
@@ -136,8 +136,8 @@ export class RenameChannelModal extends React.Component {
if (!channel.display_name) { if (!channel.display_name) {
state.displayNameError = formatMessage(holders.required); state.displayNameError = formatMessage(holders.required);
state.invalid = true; state.invalid = true;
} else if (channel.display_name.length > 22) { } else if (channel.display_name.length > Constants.MAX_CHANNELNAME_LENGTH) {
state.displayNameError = formatMessage(holders.maxLength); state.displayNameError = formatMessage(holders.maxLength, {maxLength: Constants.MAX_CHANNELNAME_LENGTH});
state.invalid = true; state.invalid = true;
} else { } else {
state.displayNameError = ''; state.displayNameError = '';
@@ -147,8 +147,8 @@ export class RenameChannelModal extends React.Component {
if (!channel.name) { if (!channel.name) {
state.nameError = formatMessage(holders.required); state.nameError = formatMessage(holders.required);
state.invalid = true; state.invalid = true;
} else if (channel.name.length > 22) { } else if (channel.name.length > Constants.MAX_CHANNELNAME_LENGTH) {
state.nameError = formatMessage(holders.maxLength); state.nameError = formatMessage(holders.maxLength, {maxLength: Constants.MAX_CHANNELNAME_LENGTH});
state.invalid = true; state.invalid = true;
} else { } else {
const cleanedName = cleanUpUrlable(channel.name); const cleanedName = cleanUpUrlable(channel.name);
@@ -264,7 +264,7 @@ export class RenameChannelModal extends React.Component {
className='form-control' className='form-control'
placeholder={formatMessage(holders.displayNameHolder)} placeholder={formatMessage(holders.displayNameHolder)}
value={this.state.displayName} value={this.state.displayName}
maxLength='64' maxLength={Constants.MAX_CHANNELNAME_LENGTH}
/> />
{displayNameError} {displayNameError}
</div> </div>
@@ -287,7 +287,7 @@ export class RenameChannelModal extends React.Component {
ref='channelName' ref='channelName'
placeholder={formatMessage(holders.handleHolder)} placeholder={formatMessage(holders.handleHolder)}
value={this.state.channelName} value={this.state.channelName}
maxLength='64' maxLength={Constants.MAX_CHANNELNAME_LENGTH}
readOnly={readOnlyHandleInput} readOnly={readOnlyHandleInput}
/> />
</div> </div>

Просмотреть файл

@@ -1982,7 +1982,7 @@
"rename_channel.displayNameHolder": "Enter display name", "rename_channel.displayNameHolder": "Enter display name",
"rename_channel.handleHolder": "lowercase alphanumeric characters", "rename_channel.handleHolder": "lowercase alphanumeric characters",
"rename_channel.lowercase": "Must be lowercase alphanumeric characters", "rename_channel.lowercase": "Must be lowercase alphanumeric characters",
"rename_channel.maxLength": "This field must be less than 22 characters", "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
"rename_channel.required": "This field is required", "rename_channel.required": "This field is required",
"rename_channel.save": "Save", "rename_channel.save": "Save",
"rename_channel.title": "Rename Channel", "rename_channel.title": "Rename Channel",

Просмотреть файл

@@ -1,6 +1,8 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See License.txt for license information. // See License.txt for license information.
/* eslint-disable no-magic-numbers */
import keyMirror from 'key-mirror'; import keyMirror from 'key-mirror';
import audioIcon from 'images/icons/audio.png'; import audioIcon from 'images/icons/audio.png';