From d2199fa1ebd38ead8374361e0e13e37979954937 Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 16 Dec 2010 14:09:55 -0800 Subject: [PATCH] Profile of requestor should be visible; no outgoing request instance variable needed --- app/controllers/people_controller.rb | 1 - app/views/people/_profile_sidebar.html.haml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index e498e8bd5..265a2a5f6 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -47,7 +47,6 @@ class PeopleController < ApplicationController if @person @incoming_request = Request.to(current_user).from(@person).first - @outgoing_request = Request.from(current_user).to(@person).first @profile = @person.profile @contact = current_user.contact_for(@person) diff --git a/app/views/people/_profile_sidebar.html.haml b/app/views/people/_profile_sidebar.html.haml index 58a505ef3..ce85cc2ce 100644 --- a/app/views/people/_profile_sidebar.html.haml +++ b/app/views/people/_profile_sidebar.html.haml @@ -35,7 +35,7 @@ %br %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 %li %h3 #{t('.bio')}