nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

it can somehow happen that a person has no profile. somehow. idk why.

Browse source
This commit is contained in:
MrZYX 2011-02-13 19:29:04 +01:00
parent 86cc7a0d35
commit 20e1316491
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/application_helper.rb
View file

@ -148,7 +148,7 @@ module ApplicationHelper
end end
def person_image_link(person, opts = {}) def person_image_link(person, opts = {})
return "" if person.nil? return "" if person.nil? || person.profile.nil?
if opts[:to] == :photos if opts[:to] == :photos
link_to person_image_tag(person, opts[:size]), person_photos_path(person) link_to person_image_tag(person, opts[:size]), person_photos_path(person)
else else

4
app/models/person.rb
View file

@ -75,7 +75,7 @@ class Person < ActiveRecord::Base
end end
def name(opts = {}) def name(opts = {})
@name ||= if profile.first_name.nil? || profile.first_name.blank? @name ||= if profile.nil? || profile.first_name.nil? || profile.first_name.blank?
self.diaspora_handle self.diaspora_handle
else else
"#{profile.first_name.to_s} #{profile.last_name.to_s}" "#{profile.first_name.to_s} #{profile.last_name.to_s}"
@ -83,7 +83,7 @@ class Person < ActiveRecord::Base
end end
def first_name def first_name
@first_name ||= if profile.first_name.nil? || profile.first_name.blank? @first_name ||= if profile.nil? || profile.first_name.nil? || profile.first_name.blank?
self.diaspora_handle.split('@').first self.diaspora_handle.split('@').first
else else
profile.first_name.to_s profile.first_name.to_s