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

add 'incoming_email' to groups

Browse Source
This commit is contained in:
Régis Hanol
2015-12-07 12:39:28 +01:00
parent fa6687841f
commit 578f606a1a
10 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/group.rb
View File

@@ -8,6 +8,8 @@ class Group < ActiveRecord::Base
has_many :categories, through: :category_groups
has_many :users, through: :group_users
before_save :downcase_incoming_email
after_save :destroy_deletions
after_save :automatic_group_membership
after_save :update_primary_group
@@ -23,6 +25,7 @@ class Group < ActiveRecord::Base
validate :name_format_validator
validates_uniqueness_of :name, case_sensitive: false
validate :automatic_membership_email_domains_format_validator
validate :incoming_email_validator
AUTO_GROUPS = {
:everyone => 0,
@@ -70,6 +73,17 @@ class Group < ActiveRecord::Base
)", levels: levels, user_id: user && user.id )
}
def downcase_incoming_email
self.incoming_email = (incoming_email || "").strip.downcase.presence
end
def incoming_email_validator
return if self.automatic || self.incoming_email.blank?
unless Email.is_valid?(incoming_email)
self.errors.add(:base, I18n.t('groups.errors.invalid_incoming_email', incoming_email: incoming_email))
end
end
def posts_for(guardian, before_post_id=nil)
user_ids = group_users.map {|gu| gu.user_id}
result = Post.where(user_id: user_ids).includes(:user, :topic, :topic => :category).references(:posts, :topics, :category)