zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-22 10:45:58 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added some missing model specs + PaperTrail session fix

Browse source
This commit is contained in:
Priit Tark 2015-02-02 18:09:01 +02:00
parent c248a957a6
commit a637eb5e01
39 changed files with 1447 additions and 845 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/models/user.rb
View file

@ -7,12 +7,13 @@ class User < ActiveRecord::Base
# After activisation, system should require to change temp password.
# TODO: Estonian id validation
validates :username, :password, presence: true
validates :username, :password, :country_code, presence: true
validates :identity_code, uniqueness: true, allow_blank: true
validates :identity_code, presence: true, if: -> { country.alpha2 == 'EE' }
validates :email, presence: true, if: -> { country.alpha2 != 'EE' }
validates :identity_code, presence: true, if: -> { country_code == 'EE' }
validates :email, presence: true, if: -> { country_code != 'EE' }
validate :validate_identity_code
belongs_to :country_deprecated, foreign_key: :country_id
ROLES = %w(user customer_service admin)