Merge branch '105361584-contact_view' into staging

This commit is contained in:
Stas 2015-11-12 18:33:33 +02:00
commit 552af44e71

View file

@ -15,7 +15,6 @@ xml.epp_head do
xml.tag!('contact:postalInfo', type: 'int') do xml.tag!('contact:postalInfo', type: 'int') do
xml.tag!('contact:name', @contact.name) xml.tag!('contact:name', @contact.name)
if can? :view_full_info, @contact, @password
xml.tag!('contact:org', @contact.org_name) if @contact.org_name.present? xml.tag!('contact:org', @contact.org_name) if @contact.org_name.present?
xml.tag!('contact:addr') do xml.tag!('contact:addr') do
xml.tag!('contact:street', @contact.street) xml.tag!('contact:street', @contact.street)
@ -25,13 +24,10 @@ xml.epp_head do
xml.tag!('contact:cc', @contact.country_code) xml.tag!('contact:cc', @contact.country_code)
end end
end end
end
if can? :view_full_info, @contact, @password
xml.tag!('contact:voice', @contact.phone) xml.tag!('contact:voice', @contact.phone)
xml.tag!('contact:fax', @contact.fax) if @contact.fax.present? xml.tag!('contact:fax', @contact.fax) if @contact.fax.present?
xml.tag!('contact:email', @contact.email) xml.tag!('contact:email', @contact.email)
end
xml.tag!('contact:clID', @contact.registrar.try(:name)) xml.tag!('contact:clID', @contact.registrar.try(:name))
if @contact.creator.try(:registrar).blank? && Rails.env.test? if @contact.creator.try(:registrar).blank? && Rails.env.test?