Add contry select to user form

This commit is contained in:
Martin Lensment 2014-09-30 12:43:02 +03:00
parent f76d73c597
commit 0dc0cc63d9
6 changed files with 16 additions and 16 deletions

View file

@ -8,12 +8,14 @@ class User < ActiveRecord::Base
belongs_to :role
belongs_to :registrar
belongs_to :country
validates :username, :password, presence: true
validates :identity_code, uniqueness: true, allow_blank: true
validate :registrar_presence
validates :identity_code, presence: true, if: -> { country.iso == 'EE' && identity_code.blank? }
validates :registrar, presence: true, if: -> { !admin && !registrar }
before_save :manage_registrar
before_save -> { self.registrar = nil if admin? }
attr_accessor :registrar_typeahead
@ -24,16 +26,4 @@ class User < ActiveRecord::Base
def registrar_typeahead
@registrar_typeahead || registrar || nil
end
private
def registrar_presence
if !admin && !registrar
errors.add(:registrar, :blank)
end
end
def manage_registrar
self.registrar = nil if admin?
end
end