Merge branch 'master' of github.com:internetee/registry

This commit is contained in:
Martin Lensment 2015-01-08 11:45:40 +02:00
commit ab7ec778dc
4 changed files with 9 additions and 3 deletions

View file

@ -168,8 +168,7 @@ module Epp::ContactsHelper
end
def ident_type
result = params[:frame].slice(/(?<=\<ns2:ident type=)(.*)(?=<)/)
result = parsed_frame.css('ident').first.try(:attributes).try(:[], 'flag').try(:value)
return nil unless result
Contact::IDENT_TYPES.any? { |type| return type if result.include?(type) }

View file

@ -164,6 +164,7 @@ class Contact < ActiveRecord::Base
contact_hash = {
phone: ph[:voice],
ident: ph[:ident],
ident_type: ph[:ident_type],
email: ph[:email],
fax: ph[:fax],
name: ph[:postalInfo].try(:[], :name),