consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes user verifications for hidden users

Browse Source
This commit is contained in:
kikito
2015-10-19 20:12:45 +02:00
parent 5cdf298738
commit 34753296fb
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/user.rb
View File

@@ -23,8 +23,8 @@ class User < ActiveRecord::Base
has_many :comments, -> { with_hidden } has_many :comments, -> { with_hidden }
has_many :failed_census_calls has_many :failed_census_calls
validates :username, presence: true, unless: :organization? validates :username, presence: true, if: :username_required?
validates :username, uniqueness: true, unless: :organization? validates :username, uniqueness: true, if: :username_required?
validates :document_number, uniqueness: { scope: :document_type }, allow_nil: true validates :document_number, uniqueness: { scope: :document_type }, allow_nil: true
validate :validate_username_length validate :validate_username_length
@@ -147,6 +147,7 @@ class User < ActiveRecord::Base
end end
def erase(erase_reason = nil) def erase(erase_reason = nil)
self.hide
self.update( self.update(
erase_reason: erase_reason, erase_reason: erase_reason,
username: nil, username: nil,
@@ -159,8 +160,6 @@ class User < ActiveRecord::Base
reset_password_token: nil, reset_password_token: nil,
email_verification_token: nil email_verification_token: nil
) )
self.hide
end end
def email_provided? def email_provided?
@@ -189,8 +188,15 @@ class User < ActiveRecord::Base
super super
end end
private def username_required?
!organization? && !hidden?
end
def email_required?
!hidden?
end
private
def clean_document_number def clean_document_number
self.document_number = self.document_number.gsub(/[^a-z0-9]+/i, "").upcase unless self.document_number.blank? self.document_number = self.document_number.gsub(/[^a-z0-9]+/i, "").upcase unless self.document_number.blank?
end end