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

Profile of requestor should be visible; no outgoing request instance variable needed

Browse source
This commit is contained in:
Raphael 2010-12-16 14:09:55 -08:00
parent eb56521a66
commit d2199fa1eb
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/people_controller.rb
View file

@ -47,7 +47,6 @@ class PeopleController < ApplicationController
if @person if @person
@incoming_request = Request.to(current_user).from(@person).first @incoming_request = Request.to(current_user).from(@person).first
@outgoing_request = Request.from(current_user).to(@person).first
@profile = @person.profile @profile = @person.profile
@contact = current_user.contact_for(@person) @contact = current_user.contact_for(@person)

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 -if (contact && !contact.pending?) || person == current_user.person || @incoming_request
%ul#profile_information %ul#profile_information
%li %li
%h3 #{t('.bio')} %h3 #{t('.bio')}