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

fixed #881

Browse source
This commit is contained in:
MrZYX 2011-02-20 13:00:30 +01:00
parent 183c840108
commit af14fa76a1
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/people/_profile_sidebar.html.haml
View file

@ -35,7 +35,7 @@
%br %br
%hr{:style=>"width:300px;"} %hr{:style=>"width:300px;"}
-if (contact && !contact.pending?) || person == current_user.person || @incoming_request -if (contact.persisted? && !contact.pending?) || person == current_user.person || @incoming_request
%ul#profile_information %ul#profile_information
%li %li
- unless person.profile.bio.blank? - unless person.profile.bio.blank?

2
app/views/people/show.html.haml
View file

@ -8,7 +8,7 @@
.span-8.append-1.last .span-8.append-1.last
= render :partial => 'people/profile_sidebar', :locals => {:person => @person, :contact => @contact } = render :partial => 'people/profile_sidebar', :locals => {:person => @person, :contact => @contact }
- if @contact && @contacts_of_contact.count > 0 - if @contact.persisted? && @contacts_of_contact.count > 0
.span-8.last .span-8.last
%hr{:style=>"width:300px;"} %hr{:style=>"width:300px;"}
.section.contact_pictures .section.contact_pictures

4
app/views/people/show.mobile.haml
View file

@ -7,7 +7,7 @@
DIASPORA* DIASPORA*
#author_info.profile #author_info.profile
- unless @contact || current_user.person == @person - unless @contact.persisted? || current_user.person == @person
.right .right
= link_to "start sharing", = link_to "start sharing",
{:controller => "contact", {:controller => "contact",
@ -24,7 +24,7 @@
.description .description
= @person.diaspora_handle = @person.diaspora_handle
- unless @contact || current_user.person == @person - unless @contact.persisted? || current_user.person == @person
- if @incoming_request - if @incoming_request
.floating .floating
%h3 %h3