summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-11-04 17:20:21 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-11-04 17:20:21 -0400
commit18745b2d5c1899bc279696548cb3ebecf7c6b90f (patch)
tree23cf9a3f8a75a89970792dd6ce0ff5b26df82850 /webapp
parent20254073cb9976e783875f997a291829e6a0d78d (diff)
downloadchat-18745b2d5c1899bc279696548cb3ebecf7c6b90f.tar.gz
chat-18745b2d5c1899bc279696548cb3ebecf7c6b90f.tar.bz2
chat-18745b2d5c1899bc279696548cb3ebecf7c6b90f.zip
Increase Channel Purpose length to 250, and add channel field length handling code to the slack importer (#4458)
* Increase Channel Purpose length to 250. This commit increases the maxmimum length of the channel purpose field to 250, including the database migration necessary. It also adds a method to the Slack importer to check the lengths of channel properties before importing, and truncate them if necessary. Fixes #4168 * Fix database migration.
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/edit_channel_purpose_modal.jsx2
-rw-r--r--webapp/components/new_channel_modal.jsx2
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/edit_channel_purpose_modal.jsx b/webapp/components/edit_channel_purpose_modal.jsx
index bfb4d181a..7ba2eff2c 100644
--- a/webapp/components/edit_channel_purpose_modal.jsx
+++ b/webapp/components/edit_channel_purpose_modal.jsx
@@ -155,7 +155,7 @@ export default class EditChannelPurposeModal extends React.Component {
ref='purpose'
className='form-control no-resize'
rows='6'
- maxLength='128'
+ maxLength='250'
defaultValue={this.props.channel.purpose}
onKeyDown={this.handleKeyDown}
/>
diff --git a/webapp/components/new_channel_modal.jsx b/webapp/components/new_channel_modal.jsx
index 31ed15306..4122c3bfb 100644
--- a/webapp/components/new_channel_modal.jsx
+++ b/webapp/components/new_channel_modal.jsx
@@ -283,7 +283,7 @@ class NewChannelModal extends React.Component {
ref='channel_purpose'
rows='4'
placeholder={this.props.intl.formatMessage({id: 'channel_modal.purpose'})}
- maxLength='128'
+ maxLength='250'
value={this.props.channelData.purpose}
onChange={this.handleChange}
tabIndex='2'