Merge branch 'release/0.5.0.0-RC' into develop

This commit is contained in:
Jonne Haß 2015-04-10 19:23:00 +02:00
commit 5481ddb540

View file

@ -1,6 +1,11 @@
module ServicesHelper
@@contact_proxy = Contact.new(:aspects => [])
def contact_proxy(friend)
friend.contact || @@contact_proxy.dup.tap{|c| c.person = friend.person}
friend.contact || contact_proxy_template.dup.tap {|c| c.person = friend.person }
end
private
def contact_proxy_template
@@contact_proxy ||= Contact.new(:aspects => [])
end
end