post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Migrate poll options max 4 to 8

Browse source
This commit is contained in:
KMY 2023-04-02 12:33:03 +09:00
parent 239d4a3ed0
commit 9cee344e99
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/compose/components/poll_form.jsx
View file

@ -161,7 +161,7 @@ class PollForm extends ImmutablePureComponent {
</ul> </ul>
<div className='poll__footer'> <div className='poll__footer'>
<button type='button' disabled={options.size >= 4} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button> <button type='button' disabled={options.size >= 8} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
{/* eslint-disable-next-line jsx-a11y/no-onchange */} {/* eslint-disable-next-line jsx-a11y/no-onchange */}
<select value={expiresIn} onChange={this.handleSelectDuration}> <select value={expiresIn} onChange={this.handleSelectDuration}>

2
app/validators/poll_validator.rb
View file

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