Merge branch 'story/117991277-ident-cc' into staging

This commit is contained in:
Vladimir Krylov 2016-04-20 14:46:39 +03:00
commit 7fab4009f0

View file

@ -82,7 +82,7 @@ class Contact < ActiveRecord::Base
ORG = 'org'
PRIV = 'priv'
BIRTHDAY = 'birthday'
BIRTHDAY = 'birthday'.freeze
PASSPORT = 'passport'
IDENT_TYPES = [
@ -257,6 +257,8 @@ class Contact < ActiveRecord::Base
if ident.size != 8 || !(ident =~/\A[0-9]{8}\z/)
errors.add(:ident, err_msg)
end
when BIRTHDAY
errors.add(:ident, err_msg)
end
end
end
@ -289,6 +291,10 @@ class Contact < ActiveRecord::Base
!org?
end
def birthday?
ident_type == BIRTHDAY
end
def generate_auth_info
return if @generate_auth_info_disabled
return if auth_info.present?