X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8ae5d94b2f16d6f2cf1739e19ebc3793a18a0a4a..477b765c42aa63764c6548931def0993f733470a:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 759c8d0b0..d3a05d4bb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -18,6 +18,9 @@ class User < ActiveRecord::Base has_many :active_blocks, :class_name => "UserBlock", :conditions => proc { [ "user_blocks.ends_at > :ends_at or user_blocks.needs_view", { :ends_at => Time.now.getutc } ] } has_many :roles, :class_name => "UserRole" + scope :visible, where(:status => ["pending", "active", "confirmed"]) + scope :active, where(:status => ["active", "confirmed"]) + validates_presence_of :email, :display_name validates_confirmation_of :email#, :message => ' addresses must match' validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password'