IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: ensure email in address insn't used it both Groups & Categories

Browse Source
This commit is contained in:
Régis Hanol
2016-03-08 20:52:04 +01:00
parent cf140aaaec
commit 031146a821
4 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/group.rb
View File

@@ -82,8 +82,12 @@ class Group < ActiveRecord::Base
def incoming_email_validator
return if self.automatic || self.incoming_email.blank?
incoming_email.split("|").each do |email|
unless Email.is_valid?(email)
self.errors.add(:base, I18n.t('groups.errors.invalid_incoming_email', incoming_email: email))
if !Email.is_valid?(email)
self.errors.add(:base, I18n.t('groups.errors.invalid_incoming_email', email: email))
elsif group = Group.where.not(id: self.id).find_by_email(email)
self.errors.add(:base, I18n.t('groups.errors.email_already_used_in_group', email: email, group_name: group.name))
elsif category = Category.find_by_email(email)
self.errors.add(:base, I18n.t('groups.errors.email_already_used_in_category', email: email, category_name: category.name))
end
end
end
@@ -334,7 +338,7 @@ class Group < ActiveRecord::Base
end
def self.find_by_email(email)
self.where("incoming_email LIKE ?", "%#{Email.downcase(email)}%").first
self.where("string_to_array(incoming_email, '|') @> ARRAY[?]", Email.downcase(email)).first
end
def bulk_add(user_ids)