Merge pull request #2100 from deivid-rodriguez/fix/direct_messages_max_per_day

Fix `direct_messages_max_per_day` set to nil
This commit is contained in:
Raimond Garcia
2017-11-09 19:14:29 +01:00
committed by GitHub
2 changed files with 37 additions and 24 deletions

View File

@@ -13,6 +13,7 @@ class DirectMessage < ActiveRecord::Base
def max_per_day
return if errors.any?
max = Setting[:direct_message_max_per_day]
return unless max
if sender.direct_messages_sent.today.count >= max.to_i
errors.add(:title, I18n.t('activerecord.errors.models.direct_message.attributes.max_per_day.invalid'))