diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-12 02:54:13 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-12 02:54:13 -0600 |
| commit | a057ed5cfea2c1c4fb21984cadae993740fb25e0 (patch) | |
| tree | c965f135b8c46f679eb22e80a37550c8b985b9ea /app/validators | |
| parent | 04eaa1943f002865f8a0234e19c6ea4cc1d3bb6a (diff) | |
| parent | 14c4a33cd9bfc1212cb362897272e5ea7d1529e5 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Diffstat (limited to 'app/validators')
| -rw-r--r-- | app/validators/status_pin_validator.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/validators/status_pin_validator.rb b/app/validators/status_pin_validator.rb index 9760e1138..64da04120 100644 --- a/app/validators/status_pin_validator.rb +++ b/app/validators/status_pin_validator.rb @@ -2,9 +2,9 @@ class StatusPinValidator < ActiveModel::Validator def validate(pin) - pin.errors.add(:status, I18n.t('statuses.pin_errors.reblog')) if pin.status.reblog? - pin.errors.add(:status, I18n.t('statuses.pin_errors.ownership')) if pin.account_id != pin.status.account_id - pin.errors.add(:status, I18n.t('statuses.pin_errors.private')) unless %w(public unlisted).include?(pin.status.visibility) - pin.errors.add(:status, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count > 4 + pin.errors.add(:base, I18n.t('statuses.pin_errors.reblog')) if pin.status.reblog? + pin.errors.add(:base, I18n.t('statuses.pin_errors.ownership')) if pin.account_id != pin.status.account_id + pin.errors.add(:base, I18n.t('statuses.pin_errors.private')) unless %w(public unlisted).include?(pin.status.visibility) + pin.errors.add(:base, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count > 4 end end |