marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

increase polls to 6 opts x 111 chars

staging
multiple creatures 2019-03-10 09:57:21 +00:00
parent 0bdb555f57
commit b57383e025
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/compose/components/poll_form.js
View File

@ -77,7 +77,7 @@ class Option extends React.PureComponent {
<AutosuggestInput
placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
maxLength={25}
maxlength={111}
value={title}
onChange={this.handleOptionTitleChange}
suggestions={this.props.suggestions}
@ -142,7 +142,7 @@ class PollForm extends ImmutablePureComponent {
</ul>
<div className='poll__footer'>
{options.size < 4 && (
{options.size < 6 && (
<button className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
)}

4
app/validators/poll_validator.rb
View File

@ -1,8 +1,8 @@
# frozen_string_literal: true
class PollValidator < ActiveModel::Validator
MAX_OPTIONS = 4
MAX_OPTION_CHARS = 25
MAX_OPTIONS = 6
MAX_OPTION_CHARS = 111
MAX_EXPIRATION = 1.month.freeze
MIN_EXPIRATION = 5.minutes.freeze