X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ca5de5b4e01297b07ce3a9db45e908f15f7cda11..d49922eb630abb73c7faffb650ab97b3c5d94c52:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index e255dc216..4a36b3e61 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -26,6 +26,9 @@ class User < ActiveRecord::Base has_many :roles, :class_name => "UserRole" + has_many :issues + has_many :reports + scope :visible, -> { where(:status => %w(pending active confirmed)) } scope :active, -> { where(:status => %w(active confirmed)) } scope :identifiable, -> { where(:data_public => true) } @@ -52,6 +55,8 @@ class User < ActiveRecord::Base validates :home_zoom, :allow_nil => true, :numericality => { :only_integer => true } validates :preferred_editor, :inclusion => Editors::ALL_EDITORS, :allow_nil => true validates :image, :attachment_content_type => { :content_type => %r{\Aimage/.*\Z} } + validates :auth_uid, :unless => proc { |u| u.auth_provider.nil? }, + :uniqueness => { :scope => :auth_provider } validates_email_format_of :email, :if => proc { |u| u.email_changed? } validates_email_format_of :new_email, :allow_blank => true, :if => proc { |u| u.new_email_changed? }